Commit b33da62c authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
parents 3d1658f7 8c342365

client/mysqltest.c

+2 −1
Original line number Diff line number Diff line
@@ -2382,7 +2382,8 @@ int read_line(char *buf, int size) 
    if (feof(cur_file->file))

    {

  found_eof:

      if (cur_file->file != stdin){

      if (cur_file->file != stdin)

      {

	my_fclose(cur_file->file, MYF(0));

        cur_file->file= 0;

      }

mysql-test/r/create.result

+25 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ NULL 
drop table if exists t1;

create table t1 (b char(0) not null);

create table if not exists t1 (b char(0) not null);

Warnings:

Note	1050	Table 't1' already exists

insert into t1 values (""),(null);

Warnings:

Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
@@ -244,9 +246,13 @@ create table t1 select x'4132'; 
drop table t1;

create table t1 select 1,2,3;

create table if not exists t1 select 1,2;

Warnings:

Note	1050	Table 't1' already exists

create table if not exists t1 select 1,2,3,4;

ERROR 21S01: Column count doesn't match value count at row 1

create table if not exists t1 select 1;

Warnings:

Note	1050	Table 't1' already exists

select * from t1;

1	2	3

1	2	3
@@ -255,9 +261,13 @@ select * from t1; 
drop table t1;

create table t1 select 1,2,3;

create table if not exists t1 select 1,2;

Warnings:

Note	1050	Table 't1' already exists

create table if not exists t1 select 1,2,3,4;

ERROR 21S01: Column count doesn't match value count at row 1

create table if not exists t1 select 1;

Warnings:

Note	1050	Table 't1' already exists

select * from t1;

1	2	3

1	2	3
@@ -269,6 +279,7 @@ 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

select * from t1;

a	b

1	1
@@ -276,6 +287,7 @@ a b 
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

create table if not exists t1 select 3 as 'a',3 as 'b';

ERROR 23000: Duplicate entry '3' for key 1

select * from t1;
@@ -609,6 +621,19 @@ create table test.t1 like x; 
ERROR 42000: Incorrect database name 'NULL'

drop table if exists test.t1;

create database mysqltest;

create database if not exists mysqltest character set latin2;

Warnings:

Note	1007	Can't create database 'mysqltest'; database exists

show create database mysqltest;

Database	Create Database

mysqltest	CREATE DATABASE `mysqltest` /*!40100 DEFAULT CHARACTER SET latin1 */

drop database mysqltest;

use test;

create table t1 (a int);

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;

mysql-test/r/innodb.result

+11 −0
Original line number Diff line number Diff line
@@ -1719,6 +1719,17 @@ select * from t1; 
a

42

drop table t1;

create table t1 (a int not null, b int not null, c blob not null, d int not null, e int, primary key (a,b,c(255),d)) engine=innodb;

insert into t1 values (2,2,"b",2,2),(1,1,"a",1,1),(3,3,"ab",3,3);

select * from t1 order by a,b,c,d;

a	b	c	d	e

1	1	a	1	1

2	2	b	2	2

3	3	ab	3	3

explain select * from t1 order by a,b,c,d;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using filesort

drop table t1;

create table t1 (x bigint unsigned not null primary key) engine=innodb;

insert into t1(x) values (0xfffffffffffffff0),(0xfffffffffffffff1);

select * from t1;

mysql-test/r/temp_table.result

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ a b 
6	g

create TEMPORARY TABLE t2 engine=heap select * from t1;

create TEMPORARY TABLE IF NOT EXISTS t2 (a int) engine=heap;

Warnings:

Note	1050	Table 't2' already exists

CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);

ERROR 42S01: Table 't1' already exists

ALTER TABLE t1 RENAME t2;

mysql-test/r/warnings.result

+3 −1
Original line number Diff line number Diff line
@@ -63,9 +63,11 @@ show count(*) warnings; 
1

create table t1(id int);

create table if not exists t1(id int);

Warnings:

Note	1050	Table 't1' already exists

select @@warning_count;

@@warning_count

0

1

drop table t1;

create table t1(a tinyint, b int not null, c date, d char(5));

load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ',';