diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 19:57:48 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-05 19:57:48 +0400 |
commit | f5b7f6101da623a804d13b487726fd52743c08f8 (patch) | |
tree | 5efcaddbed80edc2e1c811cf36be7b90e700c7d2 /mysql-test/suite/innodb/r/innodb_mysql.result | |
parent | dd7c52d19e541dcd88aef30fffa4e9f0e33c847f (diff) | |
download | mariadb-git-f5b7f6101da623a804d13b487726fd52743c08f8.tar.gz |
Post-merge buildbot fixes:
- Update trivial .reject/.result differences (all checked)
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb_mysql.result')
-rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index be2b4b28f6a..712eafe9a12 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -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 explain select distinct f1, f2 from t1; 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; CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20), INDEX (name)); @@ -435,7 +435,7 @@ set global query_cache_size=10*1024*1024; set global query_cache_type=1; drop table if exists `test`; Warnings: -Note 1051 Unknown table 'test' +Note 1051 Unknown table 'test.test' CREATE TABLE `test` (`test1` varchar(3) NOT NULL, `test2` varchar(4) NOT NULL,PRIMARY KEY (`test1`)) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -633,7 +633,7 @@ select * from bug29807; ERROR 42S02: Table 'test.bug29807' doesn't exist drop table t1; drop table bug29807; -ERROR 42S02: Unknown table 'bug29807' +ERROR 42S02: Unknown table 'test.bug29807' create table bug29807 (a int); drop table bug29807; CREATE TABLE t1 (a INT) ENGINE=InnoDB; @@ -708,12 +708,12 @@ CREATE TABLE t2 (primary key (a)) select * from t1; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' drop table if exists t2; Warnings: -Note 1051 Unknown table 't2' +Note 1051 Unknown table 'test.t2' CREATE TEMPORARY TABLE t2 (primary key (a)) select * from t1; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' drop table if exists t2; Warnings: -Note 1051 Unknown table 't2' +Note 1051 Unknown table 'test.t2' CREATE TABLE t2 (a int, b int, primary key (a)); BEGIN; INSERT INTO t2 values(100,100); @@ -1128,7 +1128,6 @@ insert into t1 values('aaa'); alter table t1 add index(a(1024)); 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 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( |