diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-10-10 19:45:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-10-26 15:30:39 +0200 |
| commit | 73b2a326d290040e8abd68bc02ffb2182f79d1d1 (patch) | |
| tree | 7988a48a24332ffbe627d881536e71b8c218ea46 /client | |
| parent | d249761ae5a33de0011f7b56ae3934016cc16aac (diff) | |
| download | mariadb-git-73b2a326d290040e8abd68bc02ffb2182f79d1d1.tar.gz | |
MDEV-29730 mysqldump --dump-history creates broken dump if there are precision-versioned tables
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 05d13859026..dcc8c6ed69b 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -3399,7 +3399,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t mysql_free_result(result); } my_snprintf(query_buff, sizeof(query_buff), - "select column_name, extra, generation_expression " + "select column_name, extra, generation_expression, data_type " "from information_schema.columns where table_schema=database() " "and table_name=%s", quote_for_equal(table, temp_buff)); if (mysql_query_with_error_report(mysql, &result, query_buff)) @@ -3413,8 +3413,16 @@ static uint get_table_structure(const char *table, const char *db, char *table_t { if (strstr(row[1],"INVISIBLE")) complete_insert= 1; - if (vers_hidden && row[2]) - vers_hidden= strcmp(row[2], "ROW START"); + if (vers_hidden && row[2] && strcmp(row[2], "ROW START") == 0) + { + vers_hidden= 0; + if (row[3] && strcmp(row[3], "bigint") == 0) + { + maybe_die(EX_ILLEGAL_TABLE, "Cannot use --dump-history for table %s with transaction-precise history", + result_table); + *versioned= 0; + } + } if (init) { dynstr_append_checked(&select_field_names, ", "); |