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

fix extension_based_table_discovery for partitioned tables

Browse Source 
typo. the code was not matching the comment
This commit is contained in:
Sergei Golubchik 2016-03-17 13:08:06 +01:00
parent 8b9432ffac
commit 7baff9f687
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/archive/partition_archive.result
View File

@ -153,3 +153,9 @@ t1 CREATE TABLE `t1` (
PARTITIONS 5 */ PARTITIONS 5 */
#Cleanup. #Cleanup.
DROP TABLE t1; DROP TABLE t1;
create database mysqltest1;
create table mysqltest1.t1 (a int not null, b int not null) engine=archive
partition by list(a) subpartition by hash(b)
(partition p1 values in (1),
partition p2 values in (2));
drop database mysqltest1;

7
mysql-test/suite/archive/partition_archive.test
View File

@ -147,3 +147,10 @@ SHOW CREATE TABLE t1;
--echo #Cleanup. --echo #Cleanup.
DROP TABLE t1; DROP TABLE t1;
create database mysqltest1;
create table mysqltest1.t1 (a int not null, b int not null) engine=archive
partition by list(a) subpartition by hash(b)
(partition p1 values in (1),
partition p2 values in (2));
drop database mysqltest1;

2
sql/discover.cc
View File

@ -199,7 +199,7 @@ int extension_based_table_discovery(MY_DIR *dirp, const char *ext_meta,
end= cur + dirp->number_of_files; end= cur + dirp->number_of_files;
while (cur < end) while (cur < end)
{ {
char *octothorp= strrchr(cur->name + 1, '#'); char *octothorp= strchr(cur->name + 1, '#');
char *ext= strchr(octothorp ? octothorp : cur->name, FN_EXTCHAR); char *ext= strchr(octothorp ? octothorp : cur->name, FN_EXTCHAR);
if (ext) if (ext)