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/show_check.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/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 351bfaf9d96..e2b92e443ee 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1538,14 +1538,14 @@ GET_LOCK('t', 1000) SET NAMES latin1; SELECT GET_LOCK('t',1000) AS 'óóóó';; SHOW PROCESSLIST; -Id User Host db Command Time State Info -### root ### test Query ### ### SHOW PROCESSLIST -### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' +Id User Host db Command Time State Info Progress +### root ### test Query ### ### SHOW PROCESSLIST 0.000 +### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' 0.000 SET NAMES utf8; SHOW PROCESSLIST; -Id User Host db Command Time State Info -### root ### test Query ### ### SHOW PROCESSLIST -### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' +Id User Host db Command Time State Info Progress +### root ### test Query ### ### SHOW PROCESSLIST 0.000 +### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' 0.000 SELECT RELEASE_LOCK('t'); RELEASE_LOCK('t') 1 |