Skip to content

M
mariadb
Commit f5b7f610 authored by Sergey Petrunya's avatar Sergey Petrunya
Browse files
Options

Post-merge buildbot fixes: 

- Update trivial .reject/.result differences (all checked)
parent dd7c52d1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 120 deletions
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
View file @ f5b7f610
...@@ -310,7 +310,7 @@ CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1; ...@@ -310,7 +310,7 @@ CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
DROP TABLE if exists t2; DROP TABLE if exists t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
INSERT INTO t1 values (3,3); INSERT INTO t1 values (3,3);
CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1; CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
...@@ -319,7 +319,7 @@ Warnings: ...@@ -319,7 +319,7 @@ Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back Warning 1196 Some non-transactional changed tables couldn't be rolled back
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb; CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;
INSERT INTO t1 VALUES (4,4); INSERT INTO t1 VALUES (4,4);
CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1; CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
......
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
View file @ f5b7f610
...@@ -304,7 +304,7 @@ CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1; ...@@ -304,7 +304,7 @@ CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
DROP TABLE if exists t2; DROP TABLE if exists t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
INSERT INTO t1 values (3,3); INSERT INTO t1 values (3,3);
CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1; CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
...@@ -313,7 +313,7 @@ Warnings: ...@@ -313,7 +313,7 @@ Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back Warning 1196 Some non-transactional changed tables couldn't be rolled back
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb; CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;
INSERT INTO t1 VALUES (4,4); INSERT INTO t1 VALUES (4,4);
CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1; CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
......
mysql-test/suite/federated/federatedx.result
View file @ f5b7f610
...@@ -6,7 +6,7 @@ SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT; ...@@ -6,7 +6,7 @@ SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= 0; SET @@GLOBAL.CONCURRENT_INSERT= 0;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL, `id` int(20) NOT NULL,
`group` int NOT NULL default 0, `group` int NOT NULL default 0,
...@@ -17,7 +17,7 @@ CREATE TABLE federated.t1 ( ...@@ -17,7 +17,7 @@ CREATE TABLE federated.t1 (
DEFAULT CHARSET=latin1; DEFAULT CHARSET=latin1;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL, `id` int(20) NOT NULL,
`group` int NOT NULL default 0, `group` int NOT NULL default 0,
...@@ -50,7 +50,7 @@ CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t3'; ...@@ -50,7 +50,7 @@ CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t3';
ERROR HY000: Can't create federated table. Foreign data src error: database: 'federated' username: 'root' hostname: '127.0.0.1' ERROR HY000: Can't create federated table. Foreign data src error: database: 'federated' username: 'root' hostname: '127.0.0.1'
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL, `id` int(20) NOT NULL,
`group` int NOT NULL default 0, `group` int NOT NULL default 0,
...@@ -63,7 +63,7 @@ CONNECTION='mysql://user:pass@127.0.0.1:SLAVE_PORT/federated/t1'; ...@@ -63,7 +63,7 @@ CONNECTION='mysql://user:pass@127.0.0.1:SLAVE_PORT/federated/t1';
ERROR HY000: Can't create federated table. Foreign data src error: database: 'federated' username: 'user' hostname: '127.0.0.1' ERROR HY000: Can't create federated table. Foreign data src error: database: 'federated' username: 'user' hostname: '127.0.0.1'
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL, `id` int(20) NOT NULL,
`group` int NOT NULL default 0, `group` int NOT NULL default 0,
...@@ -89,7 +89,7 @@ DELETE FROM federated.t1; ...@@ -89,7 +89,7 @@ DELETE FROM federated.t1;
DROP TABLE federated.t1; DROP TABLE federated.t1;
DROP TABLE IF EXISTS federated.t2; DROP TABLE IF EXISTS federated.t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'federated.t2'
CREATE TABLE federated.t2 ( CREATE TABLE federated.t2 (
`id` int(20) NOT NULL, `id` int(20) NOT NULL,
`name` varchar(32) NOT NULL default '' `name` varchar(32) NOT NULL default ''
...@@ -112,7 +112,7 @@ DROP TABLE federated.t2; ...@@ -112,7 +112,7 @@ DROP TABLE federated.t2;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
DROP TABLE IF EXISTS federated.`t1%`; DROP TABLE IF EXISTS federated.`t1%`;
Warnings: Warnings:
Note 1051 Unknown table 't1%' Note 1051 Unknown table 'federated.t1%'
CREATE TABLE federated.`t1%` ( CREATE TABLE federated.`t1%` (
`id` int(20) NOT NULL, `id` int(20) NOT NULL,
`name` varchar(32) NOT NULL default '' `name` varchar(32) NOT NULL default ''
...@@ -120,7 +120,7 @@ CREATE TABLE federated.`t1%` ( ...@@ -120,7 +120,7 @@ CREATE TABLE federated.`t1%` (
DEFAULT CHARSET=latin1; DEFAULT CHARSET=latin1;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL, `id` int(20) NOT NULL,
`name` varchar(32) NOT NULL default '' `name` varchar(32) NOT NULL default ''
...@@ -152,7 +152,7 @@ DROP TABLE IF EXISTS federated.`t1%`; ...@@ -152,7 +152,7 @@ DROP TABLE IF EXISTS federated.`t1%`;
DROP TABLE IF EXISTS federated.`t1%`; DROP TABLE IF EXISTS federated.`t1%`;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL auto_increment, `id` int(20) NOT NULL auto_increment,
`name` varchar(32) NOT NULL default '', `name` varchar(32) NOT NULL default '',
...@@ -1391,7 +1391,7 @@ PRIMARY KEY (`id`), ...@@ -1391,7 +1391,7 @@ PRIMARY KEY (`id`),
key (country_id)); key (country_id));
DROP TABLE IF EXISTS federated.countries; DROP TABLE IF EXISTS federated.countries;
Warnings: Warnings:
Note 1051 Unknown table 'countries' Note 1051 Unknown table 'federated.countries'
CREATE TABLE federated.countries ( CREATE TABLE federated.countries (
`id` int(20) NOT NULL auto_increment, `id` int(20) NOT NULL auto_increment,
`country` varchar(32), `country` varchar(32),
...@@ -1544,13 +1544,13 @@ drop table federated.t1; ...@@ -1544,13 +1544,13 @@ drop table federated.t1;
drop table federated.t1; drop table federated.t1;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL auto_increment, `id` int(20) NOT NULL auto_increment,
PRIMARY KEY (`id`)); PRIMARY KEY (`id`));
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'federated.t1'
CREATE TABLE federated.t1 ( CREATE TABLE federated.t1 (
`id` int(20) NOT NULL auto_increment, `id` int(20) NOT NULL auto_increment,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
......
mysql-test/suite/innodb/r/innodb-autoinc.result
View file @ f5b7f610
...@@ -171,7 +171,7 @@ t1 CREATE TABLE `t1` ( ...@@ -171,7 +171,7 @@ t1 CREATE TABLE `t1` (
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES (NULL, 1); INSERT INTO t1 VALUES (NULL, 1);
DELETE FROM t1 WHERE c1 = 1; DELETE FROM t1 WHERE c1 = 1;
...@@ -184,7 +184,7 @@ c1 c2 ...@@ -184,7 +184,7 @@ c1 c2
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES (NULL, 1); INSERT INTO t1 VALUES (NULL, 1);
DELETE FROM t1 WHERE c1 = 1; DELETE FROM t1 WHERE c1 = 1;
...@@ -203,7 +203,7 @@ auto_increment_increment 100 ...@@ -203,7 +203,7 @@ auto_increment_increment 100
auto_increment_offset 10 auto_increment_offset 10
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES (NULL),(5),(NULL); INSERT INTO t1 VALUES (NULL),(5),(NULL);
INSERT INTO t1 VALUES (250),(NULL); INSERT INTO t1 VALUES (250),(NULL);
...@@ -236,7 +236,7 @@ auto_increment_increment 1 ...@@ -236,7 +236,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(0); INSERT INTO t1 VALUES(0);
SELECT * FROM t1; SELECT * FROM t1;
...@@ -275,7 +275,7 @@ auto_increment_increment 1 ...@@ -275,7 +275,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(-1); INSERT INTO t1 VALUES(-1);
SELECT * FROM t1; SELECT * FROM t1;
...@@ -321,7 +321,7 @@ auto_increment_increment 1 ...@@ -321,7 +321,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(-1); INSERT INTO t1 VALUES(-1);
Warnings: Warnings:
...@@ -376,7 +376,7 @@ auto_increment_increment 1 ...@@ -376,7 +376,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(-1); INSERT INTO t1 VALUES(-1);
Warnings: Warnings:
...@@ -425,7 +425,7 @@ auto_increment_increment 1 ...@@ -425,7 +425,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 BIGINT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 BIGINT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(NULL); INSERT INTO t1 VALUES(NULL);
INSERT INTO t1 VALUES (9223372036854775794); INSERT INTO t1 VALUES (9223372036854775794);
...@@ -458,7 +458,7 @@ auto_increment_increment 1 ...@@ -458,7 +458,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(NULL); INSERT INTO t1 VALUES(NULL);
INSERT INTO t1 VALUES (18446744073709551603); INSERT INTO t1 VALUES (18446744073709551603);
...@@ -486,7 +486,7 @@ auto_increment_increment 1 ...@@ -486,7 +486,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(NULL); INSERT INTO t1 VALUES(NULL);
INSERT INTO t1 VALUES (18446744073709551603); INSERT INTO t1 VALUES (18446744073709551603);
...@@ -514,7 +514,7 @@ auto_increment_increment 1 ...@@ -514,7 +514,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 BIGINT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 BIGINT AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(NULL); INSERT INTO t1 VALUES(NULL);
INSERT INTO t1 VALUES(-9223372036854775806); INSERT INTO t1 VALUES(-9223372036854775806);
...@@ -550,7 +550,7 @@ auto_increment_increment 1 ...@@ -550,7 +550,7 @@ auto_increment_increment 1
auto_increment_offset 1 auto_increment_offset 1
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 BIGINT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES(NULL); INSERT INTO t1 VALUES(NULL);
INSERT INTO t1 VALUES (18446744073709551610); INSERT INTO t1 VALUES (18446744073709551610);
...@@ -624,10 +624,10 @@ DROP TABLE t1; ...@@ -624,10 +624,10 @@ DROP TABLE t1;
SET @@SESSION.AUTO_INCREMENT_INCREMENT=1, @@SESSION.AUTO_INCREMENT_OFFSET=5; SET @@SESSION.AUTO_INCREMENT_INCREMENT=1, @@SESSION.AUTO_INCREMENT_OFFSET=5;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TABLE t1 ( CREATE TABLE t1 (
a INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, a INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
b INT(10) UNSIGNED NOT NULL, b INT(10) UNSIGNED NOT NULL,
...@@ -844,10 +844,10 @@ DROP TABLE t1; ...@@ -844,10 +844,10 @@ DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TABLE t1( CREATE TABLE t1(
c1 INT(10) UNSIGNED NOT NULL AUTO_INCREMENT c1 INT(10) UNSIGNED NOT NULL AUTO_INCREMENT
PRIMARY KEY) ENGINE=InnoDB; PRIMARY KEY) ENGINE=InnoDB;
...@@ -1093,7 +1093,7 @@ c1 c2 ...@@ -1093,7 +1093,7 @@ c1 c2
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1(C1 DOUBLE AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB; CREATE TABLE t1(C1 DOUBLE AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB;
INSERT INTO t1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb'); INSERT INTO t1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb');
INSERT INTO t1(C2) VALUES ('innodb'); INSERT INTO t1(C2) VALUES ('innodb');
...@@ -1118,7 +1118,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1118,7 +1118,7 @@ t1 CREATE TABLE `t1` (
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 SET c1 = 1; INSERT INTO t1 SET c1 = 1;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
...@@ -1157,7 +1157,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1157,7 +1157,7 @@ t1 CREATE TABLE `t1` (
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (c1 INTEGER AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE=InnoDB; CREATE TABLE t1 (c1 INTEGER AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES (-685113344), (1), (NULL), (NULL); INSERT INTO t1 VALUES (-685113344), (1), (NULL), (NULL);
SELECT * FROM t1; SELECT * FROM t1;
...@@ -1240,7 +1240,7 @@ t1 CREATE TABLE `t1` ( ...@@ -1240,7 +1240,7 @@ t1 CREATE TABLE `t1` (
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1(c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1(c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (NULL); INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (18446744073709551615); INSERT INTO t1 VALUES (18446744073709551615);
......
mysql-test/suite/innodb/r/innodb_mysql.result
View file @ f5b7f610
...@@ -343,7 +343,7 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -343,7 +343,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index NULL PRIMARY 5 NULL 4 Using index; Using temporary 1 SIMPLE t1 index NULL PRIMARY 5 NULL 4 Using index; Using temporary
explain select distinct f1, f2 from t1; explain select distinct f1, f2 from t1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range NULL PRIMARY 5 NULL 3 Using index for group-by; Using temporary 1 SIMPLE t1 index NULL PRIMARY 5 NULL 4 Using index
drop table t1; drop table t1;
CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20), CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),
INDEX (name)); INDEX (name));
...@@ -435,7 +435,7 @@ set global query_cache_size=10*1024*1024; ...@@ -435,7 +435,7 @@ set global query_cache_size=10*1024*1024;
set global query_cache_type=1; set global query_cache_type=1;
drop table if exists `test`; drop table if exists `test`;
Warnings: Warnings:
Note 1051 Unknown table 'test' Note 1051 Unknown table 'test.test'
CREATE TABLE `test` (`test1` varchar(3) NOT NULL, CREATE TABLE `test` (`test1` varchar(3) NOT NULL,
`test2` varchar(4) NOT NULL,PRIMARY KEY (`test1`)) `test2` varchar(4) NOT NULL,PRIMARY KEY (`test1`))
ENGINE=InnoDB DEFAULT CHARSET=latin1; ENGINE=InnoDB DEFAULT CHARSET=latin1;
...@@ -633,7 +633,7 @@ select * from bug29807; ...@@ -633,7 +633,7 @@ select * from bug29807;
ERROR 42S02: Table 'test.bug29807' doesn't exist ERROR 42S02: Table 'test.bug29807' doesn't exist
drop table t1; drop table t1;
drop table bug29807; drop table bug29807;
ERROR 42S02: Unknown table 'bug29807' ERROR 42S02: Unknown table 'test.bug29807'
create table bug29807 (a int); create table bug29807 (a int);
drop table bug29807; drop table bug29807;
CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t1 (a INT) ENGINE=InnoDB;
...@@ -708,12 +708,12 @@ CREATE TABLE t2 (primary key (a)) select * from t1; ...@@ -708,12 +708,12 @@ CREATE TABLE t2 (primary key (a)) select * from t1;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
drop table if exists t2; drop table if exists t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TEMPORARY TABLE t2 (primary key (a)) select * from t1; CREATE TEMPORARY TABLE t2 (primary key (a)) select * from t1;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY' ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
drop table if exists t2; drop table if exists t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TABLE t2 (a int, b int, primary key (a)); CREATE TABLE t2 (a int, b int, primary key (a));
BEGIN; BEGIN;
INSERT INTO t2 values(100,100); INSERT INTO t2 values(100,100);
...@@ -1128,7 +1128,6 @@ insert into t1 values('aaa'); ...@@ -1128,7 +1128,6 @@ insert into t1 values('aaa');
alter table t1 add index(a(1024)); alter table t1 add index(a(1024));
Warnings: Warnings:
Warning 1071 Specified key was too long; max key length is 767 bytes Warning 1071 Specified key was too long; max key length is 767 bytes
Warning 1071 Specified key was too long; max key length is 767 bytes
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
......
mysql-test/suite/maria/maria-partitioning.result
View file @ f5b7f610
...@@ -2,8 +2,8 @@ set global storage_engine=aria; ...@@ -2,8 +2,8 @@ set global storage_engine=aria;
set session storage_engine=aria; set session storage_engine=aria;
DROP TABLE if exists t1,t2; DROP TABLE if exists t1,t2;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
create table t2(a blob) engine=aria; create table t2(a blob) engine=aria;
create table t1(a int primary key) engine=aria; create table t1(a int primary key) engine=aria;
insert into t2 values ('foo'),('bar'); insert into t2 values ('foo'),('bar');
......
mysql-test/suite/maria/small_blocksize.result
View file @ f5b7f610
DROP TABLE if exists t1; DROP TABLE if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (col_longtext_ucs2 longtext, col_longtext_utf8 longtext, col_varchar_255_ucs2_key varchar(255), col_set_utf8 set ('a','b'), col_char_255_ucs2 char(255), col_char_255_ucs2_key char(255), col_enum_ucs2 enum ('a','b'), col_varchar_255_ucs2 varchar(255), col_longtext_ucs2_key longtext, col_longtext_utf8_key longtext, col_enum_utf8 enum ('a','b'), col_varchar_255_utf8_key varchar(1024), col_varchar_255_utf8 varchar(255), col_enum_ucs2_key enum ('a','b'), col_enum_utf8_key enum ('a','b'), col_set_utf8_key set ('a','b'), col_char_255_utf8 char(255), pk integer auto_increment, col_set_ucs2_key set ('a','b'), col_char_255_utf8_key char(255), col_set_ucs2 set ('a','b'), primary key (pk)) ENGINE=aria; CREATE TABLE t1 (col_longtext_ucs2 longtext, col_longtext_utf8 longtext, col_varchar_255_ucs2_key varchar(255), col_set_utf8 set ('a','b'), col_char_255_ucs2 char(255), col_char_255_ucs2_key char(255), col_enum_ucs2 enum ('a','b'), col_varchar_255_ucs2 varchar(255), col_longtext_ucs2_key longtext, col_longtext_utf8_key longtext, col_enum_utf8 enum ('a','b'), col_varchar_255_utf8_key varchar(1024), col_varchar_255_utf8 varchar(255), col_enum_ucs2_key enum ('a','b'), col_enum_utf8_key enum ('a','b'), col_set_utf8_key set ('a','b'), col_char_255_utf8 char(255), pk integer auto_increment, col_set_ucs2_key set ('a','b'), col_char_255_utf8_key char(255), col_set_ucs2 set ('a','b'), primary key (pk)) ENGINE=aria;
INSERT INTO t1 ( col_char_255_utf8, col_varchar_255_utf8_key, col_longtext_utf8_key ) VALUES ( 'lggnqojgqectqlkvskffihliqcwoakzzzjvhkqlwjybkngdbubskflpmzegdrk', REPEAT( 'a', 627 ), 'mlggnqojgqectqlkvskffihliqcwoakzzzjvhkqlwjybkngdbubskflpmzegdrklnipcmzbtwdqfnyinqfohgtiwmvfpbuslgobjhslxnaybcyebhsrlipnuvalhmvhlwbwujtvjsdrbyapfzprnxfgtrukwhywtkaoupsaogxsjxhqjkidvnpeytjgndtnrrbm' ); INSERT INTO t1 ( col_char_255_utf8, col_varchar_255_utf8_key, col_longtext_utf8_key ) VALUES ( 'lggnqojgqectqlkvskffihliqcwoakzzzjvhkqlwjybkngdbubskflpmzegdrk', REPEAT( 'a', 627 ), 'mlggnqojgqectqlkvskffihliqcwoakzzzjvhkqlwjybkngdbubskflpmzegdrklnipcmzbtwdqfnyinqfohgtiwmvfpbuslgobjhslxnaybcyebhsrlipnuvalhmvhlwbwujtvjsdrbyapfzprnxfgtrukwhywtkaoupsaogxsjxhqjkidvnpeytjgndtnrrbm' );
UPDATE t1 SET col_varchar_255_utf8 = REPEAT('a', 197 ); UPDATE t1 SET col_varchar_255_utf8 = REPEAT('a', 197 );
......
mysql-test/suite/rpl/r/rpl_drop.result
View file @ f5b7f610
...@@ -2,5 +2,5 @@ include/master-slave.inc ...@@ -2,5 +2,5 @@ include/master-slave.inc
[connection master] [connection master]
create table t1 (a int); create table t1 (a int);
drop table t1, t2; drop table t1, t2;
ERROR 42S02: Unknown table 't2' ERROR 42S02: Unknown table 'test.t2'
include/rpl_end.inc include/rpl_end.inc
mysql-test/suite/rpl/r/rpl_drop_temp.result
View file @ f5b7f610
...@@ -10,12 +10,12 @@ Slave_open_temp_tables 0 ...@@ -10,12 +10,12 @@ Slave_open_temp_tables 0
drop database mysqltest; drop database mysqltest;
DROP TEMPORARY TABLE IF EXISTS tmp1; DROP TEMPORARY TABLE IF EXISTS tmp1;
Warnings: Warnings:
Note 1051 Unknown table 'tmp1' Note 1051 Unknown table 'test.tmp1'
CREATE TEMPORARY TABLE t1 ( a int ); CREATE TEMPORARY TABLE t1 ( a int );
DROP TEMPORARY TABLE t1, t2; DROP TEMPORARY TABLE t1, t2;
ERROR 42S02: Unknown table 't2' ERROR 42S02: Unknown table 'test.t2'
DROP TEMPORARY TABLE tmp2; DROP TEMPORARY TABLE tmp2;
ERROR 42S02: Unknown table 'tmp2' ERROR 42S02: Unknown table 'test.tmp2'
stop slave; stop slave;
**** On Master **** **** On Master ****
CREATE TEMPORARY TABLE tmp3 (a int); CREATE TEMPORARY TABLE tmp3 (a int);
......
mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
View file @ f5b7f610
...@@ -522,7 +522,7 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE new_tt_xx ...@@ -522,7 +522,7 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE new_tt_xx
INSERT INTO tt_1(ddl_case) VALUES (3); INSERT INTO tt_1(ddl_case) VALUES (3);
DROP TABLE IF EXISTS tt_xx, new_tt_xx; DROP TABLE IF EXISTS tt_xx, new_tt_xx;
Warnings: Warnings:
Note 1051 Unknown table 'tt_xx' Note 1051 Unknown table 'test.tt_xx'
-e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e- -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
-b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b- -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
include/show_binlog_events.inc include/show_binlog_events.inc
......
mysql-test/suite/rpl/r/rpl_multi_update3.result
View file @ f5b7f610
...@@ -121,10 +121,10 @@ i j x y z ...@@ -121,10 +121,10 @@ i j x y z
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TABLE t1 ( CREATE TABLE t1 (
idp int(11) NOT NULL default '0', idp int(11) NOT NULL default '0',
idpro int(11) default NULL, idpro int(11) default NULL,
......
mysql-test/suite/rpl/r/rpl_password_boundaries.result
View file @ f5b7f610
...@@ -12,7 +12,7 @@ include/start_slave.inc ...@@ -12,7 +12,7 @@ include/start_slave.inc
[ on master ] [ on master ]
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (i int); create table t1 (i int);
insert into t1 values (1); insert into t1 values (1);
[ on slave: synchronized ] [ on slave: synchronized ]
......
mysql-test/suite/rpl/r/rpl_row_colSize.result
View file @ f5b7f610
...@@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1; ...@@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1;
Checking MYSQL_TYPE_NEWDECIMAL fields Checking MYSQL_TYPE_NEWDECIMAL fields
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
CREATE TABLE t1 (a DECIMAL(5,2)); CREATE TABLE t1 (a DECIMAL(5,2));
......
mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
View file @ f5b7f610
...@@ -557,7 +557,7 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE new_tt_xx ...@@ -557,7 +557,7 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE new_tt_xx
INSERT INTO tt_1(ddl_case) VALUES (3); INSERT INTO tt_1(ddl_case) VALUES (3);
DROP TABLE IF EXISTS tt_xx, new_tt_xx; DROP TABLE IF EXISTS tt_xx, new_tt_xx;
Warnings: Warnings:
Note 1051 Unknown table 'tt_xx' Note 1051 Unknown table 'test.tt_xx'
-e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e- -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
-b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b- -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
include/show_binlog_events.inc include/show_binlog_events.inc
......
mysql-test/suite/rpl/r/rpl_session_var.result
View file @ f5b7f610
...@@ -2,7 +2,7 @@ include/master-slave.inc ...@@ -2,7 +2,7 @@ include/master-slave.inc
[connection master] [connection master]
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1(a varchar(100),b int); create table t1(a varchar(100),b int);
set @@session.sql_mode=pipes_as_concat; set @@session.sql_mode=pipes_as_concat;
insert into t1 values('My'||'SQL', 1); insert into t1 values('My'||'SQL', 1);
......
mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
View file @ f5b7f610
...@@ -521,7 +521,7 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE new_tt_xx ...@@ -521,7 +521,7 @@ master-bin.000001 # Query # # use `test`; TRUNCATE TABLE new_tt_xx
INSERT INTO tt_1(ddl_case) VALUES (3); INSERT INTO tt_1(ddl_case) VALUES (3);
DROP TABLE IF EXISTS tt_xx, new_tt_xx; DROP TABLE IF EXISTS tt_xx, new_tt_xx;
Warnings: Warnings:
Note 1051 Unknown table 'tt_xx' Note 1051 Unknown table 'test.tt_xx'
-e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e- -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
-b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b- -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
include/show_binlog_events.inc include/show_binlog_events.inc
......
mysql-test/suite/rpl/r/rpl_stm_no_op.result
View file @ f5b7f610
...@@ -9,7 +9,7 @@ ERROR 42000: Unknown database 'mysqltest' ...@@ -9,7 +9,7 @@ ERROR 42000: Unknown database 'mysqltest'
create table t1 (a int); create table t1 (a int);
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
select * from t1; select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
create table t1 (a int, b int); create table t1 (a int, b int);
......
mysql-test/suite/rpl/r/rpl_temp_table.result
View file @ f5b7f610
...@@ -41,5 +41,5 @@ Variable_name Value ...@@ -41,5 +41,5 @@ Variable_name Value
Slave_open_temp_tables 0 Slave_open_temp_tables 0
drop table if exists t1,t2; drop table if exists t1,t2;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
include/rpl_end.inc include/rpl_end.inc
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7