diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2018-05-07 14:36:52 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-17 15:33:42 +0200 |
| commit | 60319afff73c27cc10d5ad7610430761dfbd5d25 (patch) | |
| tree | 008f9078184d1b6efe211b36957f94c1a02d840a /storage/federatedx | |
| parent | dfd6702a29643e8f3d875b4d67bcf021714432a5 (diff) | |
| download | mariadb-git-60319afff73c27cc10d5ad7610430761dfbd5d25.tar.gz | |
MDEV-15969 System versioning and FEDERATED don't work well together: DML and discovery fail
* fixed discovery
* DELETE fix
* federated.test
Closes tempesta-tech/mariadb#490
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 8f793230926..57cf66f4b18 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -3241,7 +3241,10 @@ int ha_federatedx::delete_all_rows() query.length(0); query.set_charset(system_charset_info); - query.append(STRING_WITH_LEN("TRUNCATE ")); + if (thd->lex->sql_command == SQLCOM_TRUNCATE) + query.append(STRING_WITH_LEN("TRUNCATE ")); + else + query.append(STRING_WITH_LEN("DELETE FROM ")); append_ident(&query, share->table_name, share->table_name_length, ident_quote_char); @@ -3608,6 +3611,8 @@ int ha_federatedx::discover_assisted(handlerton *hton, THD* thd, MYSQL mysql; char buf[1024]; String query(buf, sizeof(buf), cs); + static LEX_CSTRING cut_clause={STRING_WITH_LEN(" WITH SYSTEM VERSIONING")}; + int cut_offset; MYSQL_RES *res; MYSQL_ROW rdata; ulong *rlen; @@ -3618,8 +3623,7 @@ int ha_federatedx::discover_assisted(handlerton *hton, THD* thd, mysql_init(&mysql); mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, cs->csname); - mysql_options(&mysql, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY, - (char*) &my_true); + mysql_options(&mysql, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY, (char*)&my_true); if (!mysql_real_connect(&mysql, tmp_share.hostname, tmp_share.username, tmp_share.password, tmp_share.database, @@ -3643,6 +3647,10 @@ int ha_federatedx::discover_assisted(handlerton *hton, THD* thd, goto err2; query.copy(rdata[1], rlen[1], cs); + cut_offset= (int)query.length() - (int)cut_clause.length; + if (cut_offset > 0 && !memcmp(query.ptr() + cut_offset, + cut_clause.str, cut_clause.length)) + query.length(cut_offset); query.append(STRING_WITH_LEN(" CONNECTION='"), cs); query.append_for_single_quote(table_s->connect_string.str, table_s->connect_string.length); |