diff options
| author | unknown <ingo@mysql.com> | 2006-02-03 17:57:23 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-02-03 17:57:23 +0100 |
| commit | ba0fda4d77b3ba706d539b987d02f3825cfeab86 (patch) | |
| tree | 4054c52cda9068797d885b019630b5454f75eb14 /mysql-test/r/sp_trans.result | |
| parent | a2da9aed2772475dda3b997e65e4c15d29715f9e (diff) | |
| parent | 0369042a0903ac4c0c07ec44f723b34e4f0821e1 (diff) | |
| download | mariadb-git-ba0fda4d77b3ba706d539b987d02f3825cfeab86.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.1
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
Diffstat (limited to 'mysql-test/r/sp_trans.result')
| -rw-r--r-- | mysql-test/r/sp_trans.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/sp_trans.result b/mysql-test/r/sp_trans.result index 8f2bd9985fc..f4c9bcb8bc6 100644 --- a/mysql-test/r/sp_trans.result +++ b/mysql-test/r/sp_trans.result @@ -82,7 +82,7 @@ end if; return i; end| insert into t1 values (bug10015_5(4)), (bug10015_5(5))| -ERROR 23000: Duplicate entry '1' for key 1 +ERROR 23000: Duplicate entry '1' for key 'PRIMARY' select * from t1| id 1 |