diff options
| -rw-r--r-- | mysql-test/r/create.result | 17 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
3 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index a463fb309f9..3e7c9d6eb4a 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -278,16 +278,16 @@ create table t1 (a int not null, b int, primary key (a)); insert into t1 values (1,1); create table if not exists t1 select 2; Warnings: -Warning 1364 Field 'a' doesn't have a default value Note 1050 Table 't1' already exists +Warning 1364 Field 'a' doesn't have a default value select * from t1; a b 1 1 0 2 create table if not exists t1 select 3 as 'a',4 as 'b'; Warnings: -Warning 1364 Field 'a' doesn't have a default value Note 1050 Table 't1' already exists +Warning 1364 Field 'a' doesn't have a default value create table if not exists t1 select 3 as 'a',3 as 'b'; ERROR 23000: Duplicate entry '3' for key 1 select * from t1; @@ -621,6 +621,13 @@ create table test.t1 like x; ERROR 42000: Incorrect database name 'NULL' drop table if exists test.t1; create database mysqltest; +use mysqltest; +create view v1 as select 'foo' from dual; +create table t1 like v1; +ERROR HY000: 'mysqltest.v1' is not BASE TABLE +drop view v1; +drop database mysqltest; +create database mysqltest; create database if not exists mysqltest character set latin2; Warnings: Note 1007 Can't create database 'mysqltest'; database exists @@ -634,9 +641,3 @@ create table if not exists t1 (a int); Warnings: Note 1050 Table 't1' already exists drop table t1; -use mysqltest; -create view v1 as select 'foo' from dual; -create table t1 like v1; -ERROR HY000: 'mysqltest.v1' is not BASE TABLE -drop view v1; -drop database mysqltest; diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 21397fade5d..559e88aad46 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1776,7 +1776,7 @@ Variable_name Value Innodb_rows_deleted 2070 show status like "Innodb_rows_inserted"; Variable_name Value -Innodb_rows_inserted 31722 +Innodb_rows_inserted 31725 show status like "Innodb_rows_updated"; Variable_name Value Innodb_rows_updated 29530 diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 1f56e02f1cb..48839abcb10 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1017,8 +1017,7 @@ longlong Item_func_interval::val_int() 1 got error */ -bool Item_func_between::fix_fields(THD *thd, struct st_table_list *tables, - Item **ref) +bool Item_func_between::fix_fields(THD *thd, Item **ref) { if (Item_func_opt_neg::fix_fields(thd, ref)) return 1; |