Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@cac2582
Browse files Browse the repository at this point in the history
Merge pull request duckdb/duckdb#11276 from pdet/error_handler_csv
Merge pull request duckdb/duckdb#11129 from Tmonster/fix_plan_cost_runner_regression
  • Loading branch information
krlmlr committed Mar 28, 2024
1 parent 4cee029 commit 3ba1f4b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ void CSVGlobalState::DecrementThread() {
D_ASSERT(running_threads > 0);
running_threads--;
if (running_threads == 0) {
for (auto &file : file_scans) {
file->error_handler->ErrorIfNeeded();
}
FillRejectsTable();
if (context.client_data->debug_set_max_line_length) {
context.client_data->debug_max_line_length = file_scans[0]->error_handler->GetMaxLineLength();
Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "2-dev64"
#define DUCKDB_PATCH_VERSION "2-dev74"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 10
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 0
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v0.10.2-dev64"
#define DUCKDB_VERSION "v0.10.2-dev74"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "5f74399a0e"
#define DUCKDB_SOURCE_ID "cac2582981"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down

0 comments on commit 3ba1f4b

Please sign in to comment.