database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Post-merge fixes

Browse Source 
mysql-test/r/partition_not_windows.result:
  Post-merge fixes
  New warnings
mysql-test/r/symlink.result:
  Post-merge fixes
  Typo
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Post-merge fixes
  Defeated creation of a warnings file.
mysql-test/t/partition_symlink.test:
  Post-merge fixes
  Fixed directory to an allowed one.
mysql-test/t/type_set.test:
  Post-merge fixes
  Defeated creation of a warnings file.
This commit is contained in:
unknown
2008-03-14 17:45:14 +01:00
parent 8001dd1b86
commit 0c9946bcfd
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/partition_not_windows.result
View File

@ -23,6 +23,9 @@ partition p01 values less than (1000)
data directory='/not/existing' data directory='/not/existing'
index directory='/not/existing' index directory='/not/existing'
); );
Warnings:
Warning 0 DATA DIRECTORY option ignored
Warning 0 INDEX DIRECTORY option ignored
show create table t2; show create table t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (

8
mysql-test/r/symlink.result
View File

@ -140,16 +140,16 @@ DROP TABLE t1;
End of 5.0 tests End of 5.0 tests
CREATE TABLE t1(a INT) CREATE TABLE t1(a INT)
INDEX DIRECTORY='TEST_DIR/master-data/mysql'; INDEX DIRECTORY='TEST_DIR/master-data/mysql';
ERROR HY000: Incorrect arguments to INDEX DIRECORY ERROR HY000: Incorrect arguments to INDEX DIRECTORY
CREATE TABLE t1(a INT) CREATE TABLE t1(a INT)
DATA DIRECTORY='TEST_DIR/master-data/test'; DATA DIRECTORY='TEST_DIR/master-data/test';
ERROR HY000: Incorrect arguments to DATA DIRECORY ERROR HY000: Incorrect arguments to DATA DIRECTORY
CREATE TABLE t1(a INT) CREATE TABLE t1(a INT)
DATA DIRECTORY='TEST_DIR/master-data/'; DATA DIRECTORY='TEST_DIR/master-data/';
ERROR HY000: Incorrect arguments to DATA DIRECORY ERROR HY000: Incorrect arguments to DATA DIRECTORY
CREATE TABLE t1(a INT) CREATE TABLE t1(a INT)
INDEX DIRECTORY='TEST_DIR/master-data'; INDEX DIRECTORY='TEST_DIR/master-data';
ERROR HY000: Incorrect arguments to INDEX DIRECORY ERROR HY000: Incorrect arguments to INDEX DIRECTORY
CREATE TABLE t1(a INT) CREATE TABLE t1(a INT)
INDEX DIRECTORY='TEST_DIR/master-data_var'; INDEX DIRECTORY='TEST_DIR/master-data_var';
ERROR HY000: Can't create/write to file 'TEST_DIR/master-data_var/t1.MYI' (Errcode: 2) ERROR HY000: Can't create/write to file 'TEST_DIR/master-data_var/t1.MYI' (Errcode: 2)

4
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
View File

@ -52,13 +52,13 @@ ROLLBACK;
BEGIN; BEGIN;
INSERT INTO tmyisam VALUES (5); INSERT INTO tmyisam VALUES (5);
INSERT INTO tmyisam VALUES (6); INSERT INTO tmyisam VALUES (6);
--warning 1196 #--warning 1196
ROLLBACK; ROLLBACK;
BEGIN; BEGIN;
INSERT INTO tndb VALUES (7); INSERT INTO tndb VALUES (7);
INSERT INTO tmyisam VALUES (7); INSERT INTO tmyisam VALUES (7);
--warning 1196 #--warning 1196
ROLLBACK; ROLLBACK;
SELECT * FROM tndb ORDER BY a; SELECT * FROM tndb ORDER BY a;

4
mysql-test/t/partition_symlink.test
View File

@ -134,8 +134,8 @@ eval create table t2 (i int )
partition by range (i) partition by range (i)
( (
partition p01 values less than (1000) partition p01 values less than (1000)
data directory="$MYSQLTEST_VARDIR/master-data/test/" data directory="$MYSQLTEST_VARDIR/tmp/"
index directory="$MYSQLTEST_VARDIR/master-data/test/" index directory="$MYSQLTEST_VARDIR/tmp/"
); );
enable_query_log; enable_query_log;

2
mysql-test/t/type_set.test
View File

@ -75,4 +75,4 @@ INSERT INTO t1 VALUES(9223372036854775808);
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
--# echo End of 5.0 tests -- echo End of 5.0 tests