diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/auto_increment.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/func_system.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/isam.result | 38 | ||||
| -rw-r--r-- | mysql-test/r/lock.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/lock_multi.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/not_embedded.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/show_check.result | 26 |
7 files changed, 46 insertions, 44 deletions
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result index bf6265e5b64..eadb0bb0d34 100644 --- a/mysql-test/r/auto_increment.result +++ b/mysql-test/r/auto_increment.result @@ -9,18 +9,6 @@ a b c 5 5 NULL 8 8 8 9 9 9 -a b -1 1 -5 5 -3 3 -4 4 -6 6 -a b c -1 1 NULL -5 5 NULL -3 3 NULL -4 4 NULL -6 6 6 skey sval 1 hello 2 hey diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result index c6ec28bfd34..5f5dc178bfc 100644 --- a/mysql-test/r/func_system.result +++ b/mysql-test/r/func_system.result @@ -1,4 +1,4 @@ -database() user() -test root@localhost +database() user() like "%@%" +test 1 version()>="3.23.29" 1 diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index ba12ca05feb..c5b333e06fe 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -8,3 +8,41 @@ Table Op Msg_type Msg_text test.t1 repair status OK Table Op Msg_type Msg_text test.t1 check status OK +a b +1 1 +5 5 +3 3 +4 4 +6 6 +a b c +1 1 NULL +5 5 NULL +3 3 NULL +4 4 NULL +6 6 6 +Table Op Msg_type Msg_text +test.t1 optimize status OK +Table Op Msg_type Msg_text +test.t1 check status OK +test.t2 check error The handler for the table doesn't support check/repair +Table Op Msg_type Msg_text +test.t1 repair status OK +test.t2 repair error The handler for the table doesn't support check/repair +Table Op Msg_type Msg_text +test.t2 check error The handler for the table doesn't support check/repair +test.t1 check status OK +Table Op Msg_type Msg_text +test.t2 check error Table 't2' was not locked with LOCK TABLES +test.t1 check status OK +Field Type Null Key Default Extra +a int(11) PRI 0 +b int(11) MUL 0 +c int(11) 0 +Field Type Null Key Default Extra Privileges +a int(11) PRI 0 select,insert,update,references +b int(11) MUL 0 select,insert,update,references +c int(11) 0 select,insert,update,references +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment +t1 0 PRIMARY 1 a A 4 NULL NULL +t1 1 b 1 b A 1 NULL NULL +t1 1 b 2 c A 4 NULL NULL diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result index ccd3c02558d..7b1be604024 100644 --- a/mysql-test/r/lock.result +++ b/mysql-test/r/lock.result @@ -4,7 +4,3 @@ Table Op Msg_type Msg_text test.t1 check status OK Table Op Msg_type Msg_text test.t2 check error Table 't2' was not locked with LOCK TABLES -n -4 -n -1 diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result new file mode 100644 index 00000000000..d75d9aa0216 --- /dev/null +++ b/mysql-test/r/lock_multi.result @@ -0,0 +1,4 @@ +n +4 +n +1 diff --git a/mysql-test/r/not_embedded.require b/mysql-test/r/not_embedded.require new file mode 100644 index 00000000000..b2ea98bcd0a --- /dev/null +++ b/mysql-test/r/not_embedded.require @@ -0,0 +1,2 @@ +have_embedded +0 diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 2e323f73793..8e273872704 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1,30 +1,4 @@ Table Op Msg_type Msg_text -test.t1 optimize status OK -Table Op Msg_type Msg_text -test.t1 check status OK -test.t2 check error The handler for the table doesn't support check/repair -Table Op Msg_type Msg_text -test.t1 repair status OK -test.t2 repair error The handler for the table doesn't support check/repair -Table Op Msg_type Msg_text -test.t2 check error The handler for the table doesn't support check/repair -test.t1 check status OK -Table Op Msg_type Msg_text -test.t2 check error Table 't2' was not locked with LOCK TABLES -test.t1 check status OK -Field Type Null Key Default Extra -a int(11) PRI 0 -b int(11) MUL 0 -c int(11) 0 -Field Type Null Key Default Extra Privileges -a int(11) PRI 0 select,insert,update,references -b int(11) MUL 0 select,insert,update,references -c int(11) 0 select,insert,update,references -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment -t1 0 PRIMARY 1 a A 4 NULL NULL -t1 1 b 1 b A 1 NULL NULL -t1 1 b 2 c A 4 NULL NULL -Table Op Msg_type Msg_text test.t1 check status Table is already up to date Table Op Msg_type Msg_text test.t1 check status Table is already up to date |