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

- Resolved conflict between fixes for bugs 25141 and 26074.

Browse Source 
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
This commit is contained in:
iggy@recycle.(none) 2007-04-24 16:07:52 -04:00
parent 0dfb49b0a6
commit 08ea692a7f
3 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/windows.result
View File

@ -26,18 +26,3 @@ ERROR HY000: No paths allowed for shared library
execute abc; execute abc;
ERROR HY000: No paths allowed for shared library ERROR HY000: No paths allowed for shared library
deallocate prepare abc; 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;

21
mysql-test/t/windows.test
View File

@ -1,6 +1,5 @@
# Windows-specific tests # Windows-specific tests
--source include/windows.inc --source include/windows.inc
-- source include/have_innodb.inc
# #
# Bug 9148: Denial of service # Bug 9148: Denial of service
@ -50,23 +49,3 @@ execute abc;
execute abc; execute abc;
deallocate prepare 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;

3
sql/ha_partition.cc
View File

@ -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->max_rows= part_elem->part_max_rows;
table->s->min_rows= part_elem->part_min_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, FN_LIBCHAR);
partition_name= strrchr(partition_name_with_path, '/');
if ((part_elem->index_file_name && if ((part_elem->index_file_name &&
(error= append_file_to_dir(thd, (error= append_file_to_dir(thd,
(const char**)&part_elem->index_file_name, (const char**)&part_elem->index_file_name,