Fixing test cases (ac4219fa) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/backup.result

+11 −11

Original line number	Diff line number	Diff line
		@@ -6,26 +6,26 @@ Table Op Msg_type Msg_text
		test.t4 backup error Failed copying .frm file (errno: X)
		test.t4 backup status Operation failed
		Warnings:
		Warning 1540 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Error 1 Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)
		backup table t4 to '../tmp';
		Table Op Msg_type Msg_text
		test.t4 backup status OK
		Warnings:
		Warning 1540 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		backup table t4 to '../tmp';
		Table Op Msg_type Msg_text
		test.t4 backup error Failed copying .frm file (errno: X)
		test.t4 backup status Operation failed
		Warnings:
		Warning 1540 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Error 1 Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)
		drop table t4;
		restore table t4 from '../tmp';
		Table Op Msg_type Msg_text
		test.t4 restore status OK
		Warnings:
		Warning 1540 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		select count(*) from t4;
		count(*)
		0
		@@ -35,19 +35,19 @@ backup table t1 to '../tmp';
		Table Op Msg_type Msg_text
		test.t1 backup status OK
		Warnings:
		Warning 1540 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		drop table t1;
		restore table t1 from '../bogus';
		Table Op Msg_type Msg_text
		t1 restore error Failed copying .frm file
		Warnings:
		Warning 1540 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Error 29 File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)
		restore table t1 from '../tmp';
		Table Op Msg_type Msg_text
		test.t1 restore status OK
		Warnings:
		Warning 1540 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		select n from t1;
		n
		23
		@@ -62,7 +62,7 @@ Table Op Msg_type Msg_text
		test.t2 backup status OK
		test.t3 backup status OK
		Warnings:
		Warning 1540 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		drop table t1,t2,t3;
		restore table t1,t2,t3 from '../tmp';
		Table Op Msg_type Msg_text
		@@ -70,7 +70,7 @@ test.t1 restore status OK
		test.t2 restore status OK
		test.t3 restore status OK
		Warnings:
		Warning 1540 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		select n from t1;
		n
		23
		@@ -91,7 +91,7 @@ restore table t1 from '../tmp';
		Table Op Msg_type Msg_text
		test.t1 restore status OK
		Warnings:
		Warning 1540 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		rename table t1 to t5;
		lock tables t5 write;
		backup table t5 to '../tmp';
		@@ -99,5 +99,5 @@ unlock tables;
		Table Op Msg_type Msg_text
		test.t5 backup status OK
		Warnings:
		Warning 1540 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		Warning 1541 The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.
		drop table t5;

mysql-test/r/ndb_dd_ddl.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ ERROR HY000: Failed to create LOGFILE GROUP
		SHOW WARNINGS;
		Level Code Message
		Error 1296 Got error 1514 'Currently there is a limit of one logfile group' from NDB
		Error 1506 Failed to create LOGFILE GROUP
		Error 1507 Failed to create LOGFILE GROUP
		CREATE LOGFILE GROUP lg1
		ADD UNDOFILE 'undofile.dat'
		INITIAL_SIZE 16M

mysql-test/r/sp-security.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -319,7 +319,7 @@ use db_bug7787;
		CREATE PROCEDURE p1()
		SHOW INNODB STATUS;
		Warnings:
		Warning 1540 The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW ENGINE INNODB STATUS' instead.
		Warning 1541 The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW ENGINE INNODB STATUS' instead.
		GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost;
		DROP DATABASE db_bug7787;
		use test;

mysql-test/r/type_timestamp.result

+7 −7

Original line number	Diff line number	Diff line
		@@ -100,13 +100,13 @@ create table t1 (t2 timestamp(2), t4 timestamp(4), t6 timestamp(6),
		t8 timestamp(8), t10 timestamp(10), t12 timestamp(12),
		t14 timestamp(14));
		Warnings:
		Warning 1540 The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1540 The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1540 The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1540 The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1540 The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1540 The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1540 The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1541 The syntax 'TIMESTAMP(2)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1541 The syntax 'TIMESTAMP(4)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1541 The syntax 'TIMESTAMP(6)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1541 The syntax 'TIMESTAMP(8)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1541 The syntax 'TIMESTAMP(10)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1541 The syntax 'TIMESTAMP(12)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		Warning 1541 The syntax 'TIMESTAMP(14)' is deprecated and will be removed in MySQL 5.2. Please use 'TIMESTAMP' instead.
		insert t1 values (0,0,0,0,0,0,0),
		("1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",
		"1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",

mysql-test/r/warnings.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ max_error_count 10
		drop table t1;
		set table_type=MYISAM;
		Warnings:
		Warning 1540 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead.
		Warning 1541 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead.
		create table t1 (a int);
		insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
		update t1 set a='abc';