database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-30 11:04:27 +03:00
parent 4783494a5e 2e1d10ecac
commit 6da14d7b4a
67 changed files with 1680 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.h
View File

@ -3301,13 +3301,7 @@ public:
start_bulk_insert(rows, flags);
DBUG_VOID_RETURN;
}
int ha_end_bulk_insert()
{
DBUG_ENTER("handler::ha_end_bulk_insert");
estimation_rows_to_insert= 0;
int ret= end_bulk_insert();
DBUG_RETURN(ret);
}
int ha_end_bulk_insert();
int ha_bulk_update_row(const uchar *old_data, const uchar *new_data,
ha_rows *dup_key_found);
int ha_delete_all_rows();