diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-03-06 15:56:17 +0100 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-03-06 15:56:17 +0100 |
| commit | 2417d31045cde81881a9dd7991263210687d5fc8 (patch) | |
| tree | 88da5851e80389eb99993e7f017a4a90b48f7a00 /mysql-test/r/lock_multi.result | |
| parent | 16c0631f0b785e82aef63429b5a4e7179b8aa52e (diff) | |
| parent | 0183d4d8422ba29a632eebb1e856391f2b9a289f (diff) | |
| download | mariadb-git-2417d31045cde81881a9dd7991263210687d5fc8.tar.gz | |
Merge 5.0 -> 5.1 of fix for Bug#42003 and Bug#43114
Diffstat (limited to 'mysql-test/r/lock_multi.result')
| -rw-r--r-- | mysql-test/r/lock_multi.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index a0e3d9fad06..50e37d28dd6 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -51,10 +51,10 @@ Field Type Null Key Default Extra a int(11) YES NULL unlock tables; drop table t1; -use mysql; +USE mysql; LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE; FLUSH TABLES; -use mysql; +USE mysql; SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1; OPTIMIZE TABLES columns_priv, db, host, user; Table Op Msg_type Msg_text @@ -65,7 +65,7 @@ mysql.user optimize status OK UNLOCK TABLES; Select_priv N -use test; +USE test; use test; CREATE TABLE t1 (c1 int); LOCK TABLE t1 WRITE; @@ -133,8 +133,8 @@ DROP TABLE t1; End of 5.0 tests create table t1 (i int); lock table t1 read; -update t1 set i= 10;; -select * from t1;; +update t1 set i= 10; +select * from t1; kill query ID; i ERROR 70100: Query execution was interrupted |