database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/mydev/mysql-5.1

Browse Source 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg


mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/rpl_foreign_key_innodb.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge
This commit is contained in:
unknown
2006-02-03 17:57:23 +01:00
parent a2da9aed27 0369042a09
commit ba0fda4d77
46 changed files with 203 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ Note 1051 Unknown table 't2'
CREATE TABLE t1 (a int not null);
INSERT INTO t1 values (1),(2),(1);
CREATE TABLE t2 (primary key(a)) SELECT * FROM t1;
ERROR 23000: Duplicate entry '1' for key 1
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
SELECT * from t2;
ERROR 42S02: Table 'test.t2' doesn't exist
DROP TABLE t1;
@ -280,7 +280,7 @@ create table if not exists t1 select 3 as 'a',4 as 'b';
Warnings:
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
ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
select * from t1;
a b
1 1