Commit 61c12aa2 authored by unknown's avatar unknown
Browse files

after mergemerge

parent 33022c52

mysql-test/r/create.result

+8 −0
Original line number Diff line number Diff line
@@ -563,6 +563,14 @@ select * from t2; 
b

1

drop table t1,t2;

create table t1 (a int);

create table t1 select * from t1;

ERROR HY000: You can't specify target table 't1' for update in FROM clause

create table t2 union = (t1) select * from t1;

ERROR HY000: You can't specify target table 't1' for update in FROM clause

flush tables with read lock;

unlock tables;

drop table t1;

create table t1(column.name int);

ERROR 42000: Incorrect table name 'column'

create table t1(test.column.name int);

mysql-test/t/create.test

+1 −3
Original line number Diff line number Diff line
@@ -408,12 +408,12 @@ connection user1; 
select database(), user();

connection default;

disconnect user1;

use test;



#

# Test for Bug 856 'Naming a key "Primary" causes trouble'

#



use test;

--error 1280

create table t1 (a int, index `primary` (a));

--error 1280
@@ -470,8 +470,6 @@ drop table t1,t2; 
# This tests two additional possible errors and a hang if 

# an improper fix is present.

#

connection default;

use test;

create table t1 (a int);

--error 1093

create table t1 select * from t1;