Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-03-03 20:29:58+04:00, gluh@stripped +4 -0
fixed test case problem on win
mysql-test/r/partition.result@stripped, 2008-03-03 20:29:57+04:00, gluh@stripped +0 -28
the test is moved to 'partition_not_windows' test case
mysql-test/r/partition_not_windows.result@stripped, 2008-03-03 20:29:57+04:00, gluh@stripped +28 -0
the test is moved from 'partition' test case
mysql-test/t/partition.test@stripped, 2008-03-03 20:29:57+04:00, gluh@stripped +0 -38
the test is moved to 'partition_not_windows' test case
mysql-test/t/partition_not_windows.test@stripped, 2008-03-03 20:29:57+04:00, gluh@stripped +38 -0
the test is moved from 'partition' test case
diff -Nrup a/mysql-test/r/partition.result b/mysql-test/r/partition.result
--- a/mysql-test/r/partition.result 2008-03-03 15:38:14 +04:00
+++ b/mysql-test/r/partition.result 2008-03-03 20:29:57 +04:00
@@ -1301,34 +1301,6 @@ ERROR 42000: You have an error in your S
ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTENDED' at line 1
DROP TABLE t1;
-CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test');
-ERROR HY000: Incorrect arguments to DATA DIRECORY
-CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test');
-ERROR HY000: Incorrect arguments to INDEX DIRECORY
-CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
-DATA DIRECTORY = 'TEST_DIR/master-data/test',
-SUBPARTITION s0b
-DATA DIRECTORY = 'TEST_DIR/master-data/test'
-));
-ERROR HY000: Incorrect arguments to DATA DIRECORY
-CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
-INDEX DIRECTORY = 'TEST_DIR/master-data/test',
-SUBPARTITION s0b
-INDEX DIRECTORY = 'TEST_DIR/master-data/test'
-));
-ERROR HY000: Incorrect arguments to INDEX DIRECORY
CREATE TABLE t1 (s1 BIGINT UNSIGNED)
PARTITION BY RANGE (s1) (
PARTITION p0 VALUES LESS THAN (0),
diff -Nrup a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result
--- a/mysql-test/r/partition_not_windows.result 2008-03-03 15:38:14 +04:00
+++ b/mysql-test/r/partition_not_windows.result 2008-03-03 20:29:57 +04:00
@@ -30,6 +30,34 @@ t2 CREATE TABLE `t2` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (i) (PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */
DROP TABLE t1, t2;
set @@sql_mode=@org_mode;
+CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test');
+ERROR HY000: Incorrect arguments to DATA DIRECORY
+CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test');
+ERROR HY000: Incorrect arguments to INDEX DIRECORY
+CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+DATA DIRECTORY = 'TEST_DIR/master-data/test',
+SUBPARTITION s0b
+DATA DIRECTORY = 'TEST_DIR/master-data/test'
+));
+ERROR HY000: Incorrect arguments to DATA DIRECORY
+CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+INDEX DIRECTORY = 'TEST_DIR/master-data/test',
+SUBPARTITION s0b
+INDEX DIRECTORY = 'TEST_DIR/master-data/test'
+));
+ERROR HY000: Incorrect arguments to INDEX DIRECORY
DROP TABLE IF EXISTS `example`;
CREATE TABLE `example` (
`ID_EXAMPLE` int(10) unsigned NOT NULL AUTO_INCREMENT,
diff -Nrup a/mysql-test/t/partition.test b/mysql-test/t/partition.test
--- a/mysql-test/t/partition.test 2008-03-03 15:38:14 +04:00
+++ b/mysql-test/t/partition.test 2008-03-03 20:29:57 +04:00
@@ -1546,44 +1546,6 @@ ALTER TABLE t1 ANALYZE PARTITION p1 EXTE
DROP TABLE t1;
#
-# Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY
-#
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE t1(a INT)
-PARTITION BY KEY (a)
-(PARTITION p0 INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
-
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
- DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
-SUBPARTITION s0b
- DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
-));
-
---replace_result $MYSQLTEST_VARDIR TEST_DIR
---error 1210
-eval CREATE TABLE ts (id INT, purchased DATE)
-PARTITION BY RANGE(YEAR(purchased))
-SUBPARTITION BY HASH(TO_DAYS(purchased)) (
-PARTITION p0 VALUES LESS THAN (1990) (
-SUBPARTITION s0a
- INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
-SUBPARTITION s0b
- INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
-));
-
-#
# Bug #29258: Partitions: search fails for maximum unsigned bigint
#
CREATE TABLE t1 (s1 BIGINT UNSIGNED)
diff -Nrup a/mysql-test/t/partition_not_windows.test b/mysql-test/t/partition_not_windows.test
--- a/mysql-test/t/partition_not_windows.test 2008-03-03 15:38:14 +04:00
+++ b/mysql-test/t/partition_not_windows.test 2008-03-03 20:29:57 +04:00
@@ -94,6 +94,44 @@ show create table t2;
DROP TABLE t1, t2;
set @@sql_mode=@org_mode;
+#
+# Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY
+#
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE t1(a INT)
+PARTITION BY KEY (a)
+(PARTITION p0 INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
+
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+ DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
+SUBPARTITION s0b
+ DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
+));
+
+--replace_result $MYSQLTEST_VARDIR TEST_DIR
+--error 1210
+eval CREATE TABLE ts (id INT, purchased DATE)
+PARTITION BY RANGE(YEAR(purchased))
+SUBPARTITION BY HASH(TO_DAYS(purchased)) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0a
+ INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
+SUBPARTITION s0b
+ INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
+));
+
# End Windows specific test failures.
# These tests contain non-Windows specific directory/file format.
| Thread |
|---|
| • bk commit into 5.1 tree (gluh:1.2583) | gluh | 3 Mar |
