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

Merged from 4.1 to 5.0.

Browse Source
This commit is contained in:
unknown
2005-09-13 01:44:50 +03:00
parent b33da62c5e
commit 4d29b85d14
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/r/create.result
View File

@ -278,16 +278,16 @@ create table t1 (a int not null, b int, primary key (a));
insert into t1 values (1,1); insert into t1 values (1,1);
create table if not exists t1 select 2; create table if not exists t1 select 2;
Warnings: Warnings:
Warning 1364 Field 'a' doesn't have a default value
Note 1050 Table 't1' already exists Note 1050 Table 't1' already exists
Warning 1364 Field 'a' doesn't have a default value
select * from t1; select * from t1;
a b a b
1 1 1 1
0 2 0 2
create table if not exists t1 select 3 as 'a',4 as 'b'; create table if not exists t1 select 3 as 'a',4 as 'b';
Warnings: Warnings:
Warning 1364 Field 'a' doesn't have a default value
Note 1050 Table 't1' already exists 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'; create table if not exists t1 select 3 as 'a',3 as 'b';
ERROR 23000: Duplicate entry '3' for key 1 ERROR 23000: Duplicate entry '3' for key 1
select * from t1; select * from t1;
@ -621,6 +621,13 @@ create table test.t1 like x;
ERROR 42000: Incorrect database name 'NULL' ERROR 42000: Incorrect database name 'NULL'
drop table if exists test.t1; drop table if exists test.t1;
create database mysqltest; 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; create database if not exists mysqltest character set latin2;
Warnings: Warnings:
Note 1007 Can't create database 'mysqltest'; database exists Note 1007 Can't create database 'mysqltest'; database exists
@ -634,9 +641,3 @@ create table if not exists t1 (a int);
Warnings: Warnings:
Note 1050 Table 't1' already exists Note 1050 Table 't1' already exists
drop table t1; 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;

2
mysql-test/r/innodb.result
View File

@ -1776,7 +1776,7 @@ Variable_name Value
Innodb_rows_deleted 2070 Innodb_rows_deleted 2070
show status like "Innodb_rows_inserted"; show status like "Innodb_rows_inserted";
Variable_name Value Variable_name Value
Innodb_rows_inserted 31722 Innodb_rows_inserted 31725
show status like "Innodb_rows_updated"; show status like "Innodb_rows_updated";
Variable_name Value Variable_name Value
Innodb_rows_updated 29530 Innodb_rows_updated 29530

3
sql/item_cmpfunc.cc
View File

@ -1017,8 +1017,7 @@ longlong Item_func_interval::val_int()
1 got error 1 got error
*/ */
bool Item_func_between::fix_fields(THD *thd, struct st_table_list *tables, bool Item_func_between::fix_fields(THD *thd, Item **ref)
Item **ref)
{ {
if (Item_func_opt_neg::fix_fields(thd, ref)) if (Item_func_opt_neg::fix_fields(thd, ref))
return 1; return 1;