diff options
| author | unknown <dlenev@mockturtle.local> | 2007-01-25 14:58:45 +0300 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2007-01-25 14:58:45 +0300 |
| commit | 7f2a0175b6dd9d0945221305f68ee9873eac2753 (patch) | |
| tree | e2ebd58507f451e1820cad8b6a77f46f726d7849 /mysql-test/t/sp-error.test | |
| parent | 430cbe1d14c7538cfc216f5e14b2c6102fba23b1 (diff) | |
| parent | 25f32300378a8d2ffd052c1bc7ebd2018f4b9eea (diff) | |
| download | mariadb-git-7f2a0175b6dd9d0945221305f68ee9873eac2753.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
mysql-test/t/sp-error.test:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/sp-error.test')
| -rw-r--r-- | mysql-test/t/sp-error.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test index 3e334bb61e8..e67d6370153 100644 --- a/mysql-test/t/sp-error.test +++ b/mysql-test/t/sp-error.test @@ -586,7 +586,7 @@ begin end| set @x = 0| ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME call bug3279(@x)| select @x| drop procedure bug3279| |