Commit 743b0c56 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/ram/work/5.0.b15108
parents e46602f5 bf0c5e6f

mysql-test/r/create.result

+0 −15
Original line number Diff line number Diff line
@@ -259,21 +259,6 @@ select * from t1; 
0	1	2

0	0	1

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

0	1	2

0	0	1

drop table t1;

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;

mysql-test/r/ctype_ucs.result

+7 −0
Original line number Diff line number Diff line
@@ -685,6 +685,13 @@ hex(a) 
005B

803D

drop table t1;

create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;

insert into t1 values('a');

create index t1f1 on t1(f1);

select f1 from t1 where f1 like 'a%';

f1

a

drop table t1;

CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));

INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);

update t1 set b=a;

mysql-test/r/grant2.result

+11 −0
Original line number Diff line number Diff line
@@ -107,6 +107,17 @@ delete from mysql.columns_priv where user like 'mysqltest\_%'; 
flush privileges;

drop database mysqltest;

use test;

create user mysqltest_1@host1;

create user mysqltest_2@host2;

create user mysqltest_3@host3;

create user mysqltest_4@host4;

create user mysqltest_5@host5;

create user mysqltest_6@host6;

create user mysqltest_7@host7;

flush privileges;

drop user mysqltest_3@host3;

drop user mysqltest_1@host1, mysqltest_2@host2, mysqltest_4@host4,

mysqltest_5@host5, mysqltest_6@host6, mysqltest_7@host7;

set sql_mode='maxdb';

drop table if exists t1, t2;

create table t1(c1 int);

mysql-test/r/merge.result

+49 −0
Original line number Diff line number Diff line
@@ -719,3 +719,52 @@ SELECT b FROM t2; 
b

3

DROP TABLE t1, t2;

create table t1(a int);

create table t2(a int);

insert into t1 values (1);

insert into t2 values (2);

create table t3 (a int) engine=merge union=(t1, t2) insert_method=first;

select * from t3;

a

1

2

insert t2 select * from t2;

select * from t2;

a

2

2

insert t3 select * from t1;

select * from t3;

a

1

1

2

2

insert t1 select * from t3;

select * from t1;

a

1

1

1

1

2

2

select * from t2;

a

2

2

select * from t3;

a

1

1

1

1

2

2

2

2

check table t1, t2;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

test.t2	check	status	OK

drop table t1, t2, t3;

mysql-test/t/create.test

+0 −7
Original line number Diff line number Diff line
@@ -211,13 +211,6 @@ drop table t1; 
# bug #1434

#



create table t1 select 1,2,3;

create table if not exists t1 select 1,2;

--error 1136

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

create table if not exists t1 select 1;

select * from t1;

drop table t1;

create table t1 select 1,2,3;

create table if not exists t1 select 1,2;

--error 1136