diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/r/sp-threads.result | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/r/sp-threads.result')
| -rw-r--r-- | mysql-test/r/sp-threads.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result index 9b458e25615..4dc4d81224b 100644 --- a/mysql-test/r/sp-threads.result +++ b/mysql-test/r/sp-threads.result @@ -33,11 +33,11 @@ call bug9486(); lock tables t2 write; call bug9486(); show processlist; -Id User Host db Command Time State Info -# root localhost test Sleep # NULL -# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 -# root localhost test Query # NULL show processlist -# root localhost test Sleep # NULL +Id User Host db Command Time State Info Progress +# root localhost test Sleep # NULL 0.000 +# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 0.000 +# root localhost test Query # NULL show processlist 0.000 +# root localhost test Sleep # NULL 0.000 unlock tables; drop procedure bug9486; drop table t1, t2; |