diff --git a/mysql-test/r/windows.result b/mysql-test/r/windows.result index 9f3828bff614803f0e2d038310d3cb2047a35eee..7472b724f47ea7d72af4ec14825ce98ea6c8649f 100644 --- a/mysql-test/r/windows.result +++ b/mysql-test/r/windows.result @@ -26,18 +26,3 @@ ERROR HY000: No paths allowed for shared library execute abc; ERROR HY000: No paths allowed for shared library deallocate prepare abc; -CREATE TABLE t1 ( -`pkid` int(11) NOT NULL AUTO_INCREMENT, -`SALES_DATE` date NOT NULL DEFAULT '0000-00-00', -KEY `pkid` (`pkid`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -PARTITION BY RANGE (MONTH(SALES_DATE)) -( -PARTITION p0 VALUES LESS THAN (2) ENGINE=INNODB -data DIRECTORY='c:/tmp/' - index DIRECTORY = 'c:/tmp/', -PARTITION p1 VALUES LESS THAN (3) ENGINE=INNODB -data DIRECTORY='c:/tmp/' - index DIRECTORY = 'c:/tmp/' -); -DROP TABLE t1; diff --git a/mysql-test/t/windows.test b/mysql-test/t/windows.test index efdf0963b804755dfa26b3fbb70b2051bf3de24c..a10d54b54526363ac5ab715dace6d82622711aff 100644 --- a/mysql-test/t/windows.test +++ b/mysql-test/t/windows.test @@ -1,6 +1,5 @@ # Windows-specific tests --source include/windows.inc --- source include/have_innodb.inc # # Bug 9148: Denial of service @@ -50,23 +49,3 @@ execute abc; execute abc; deallocate prepare abc; -# -# Bug #26074 Mysql crash when creating partitions -# - -CREATE TABLE t1 ( - `pkid` int(11) NOT NULL AUTO_INCREMENT, - `SALES_DATE` date NOT NULL DEFAULT '0000-00-00', - KEY `pkid` (`pkid`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -PARTITION BY RANGE (MONTH(SALES_DATE)) -( - PARTITION p0 VALUES LESS THAN (2) ENGINE=INNODB - data DIRECTORY='c:/tmp/' - index DIRECTORY = 'c:/tmp/', - PARTITION p1 VALUES LESS THAN (3) ENGINE=INNODB - data DIRECTORY='c:/tmp/' - index DIRECTORY = 'c:/tmp/' -); - -DROP TABLE t1; diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 3c25dcd202f26168b9d5d08808030463bd4379f2..d3979fa07186732660856aef47b60fe3a888e50e 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1781,8 +1781,7 @@ int ha_partition::set_up_table_before_create(TABLE *table, } table->s->max_rows= part_elem->part_max_rows; table->s->min_rows= part_elem->part_min_rows; - /* Here we have unified path so should always look for '/', not FN_LIBCHAR */ - partition_name= strrchr(partition_name_with_path, '/'); + partition_name= strrchr(partition_name_with_path, FN_LIBCHAR); if ((part_elem->index_file_name && (error= append_file_to_dir(thd, (const char**)&part_elem->index_file_name,