1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-22265 Connect string character limit too small for full 64 character InnoDB table-name limit when using ad-hoc Spider server definitions.

Browse Source 
The name of the table sent as an argument to the handler::init() has the
database name in front of it. So we should use
table_share->table_name.length.
This commit is contained in:
Alexey Botchkov 2021-04-23 13:04:36 +04:00
parent 90a306a7ab
commit 5bc12ca9c2
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/spider/mysql-test/spider/r/basic_sql.result
View File

@ -717,6 +717,10 @@ TRUNCATE TABLE ta_l;
connection master_1; connection master_1;
SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a; SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
a b date_format(c, '%Y-%m-%d %H:%i:%s') a b date_format(c, '%Y-%m-%d %H:%i:%s')
connection master_1;
create table t2345678911234567892123456789312345678941234567895123234234(id int) ENGINE=SPIDER
COMMENT='host "192.168.21.1", user "spider", password "password", database "test32738123123123"';
drop table t2345678911234567892123456789312345678941234567895123234234;
deinit deinit
connection master_1; connection master_1;

6
storage/spider/mysql-test/spider/t/basic_sql.test
View File

@ -2677,6 +2677,11 @@ if ($USE_CHILD_GROUP2)
--connection master_1 --connection master_1
SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a; SELECT a, b, date_format(c, '%Y-%m-%d %H:%i:%s') FROM ta_l ORDER BY a;
--connection master_1
create table t2345678911234567892123456789312345678941234567895123234234(id int) ENGINE=SPIDER
COMMENT='host "192.168.21.1", user "spider", password "password", database "test32738123123123"';
drop table t2345678911234567892123456789312345678941234567895123234234;
--echo --echo
--echo deinit --echo deinit
--disable_warnings --disable_warnings
@ -2689,6 +2694,7 @@ if ($USE_CHILD_GROUP2)
--connection child2_2 --connection child2_2
DROP DATABASE IF EXISTS auto_test_remote2; DROP DATABASE IF EXISTS auto_test_remote2;
} }
--disable_query_log --disable_query_log
--disable_result_log --disable_result_log
--source test_deinit.inc --source test_deinit.inc

3
storage/spider/spd_table.cc
View File

@ -3552,7 +3552,8 @@ int spider_set_connect_info_default(
if (!share->tgt_table_names[roop_count] && table_share) if (!share->tgt_table_names[roop_count] && table_share)
{ {
DBUG_PRINT("info",("spider create default tgt_table_names")); DBUG_PRINT("info",("spider create default tgt_table_names"));
share->tgt_table_names_lengths[roop_count] = share->table_name_length; share->tgt_table_names_lengths[roop_count] =
table_share->table_name.length;
if ( if (
!(share->tgt_table_names[roop_count] = spider_create_table_name_string( !(share->tgt_table_names[roop_count] = spider_create_table_name_string(
table_share->table_name.str, table_share->table_name.str,