diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-01-25 18:27:34 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-01-25 18:27:34 +0400 |
| commit | e10816118a35cdb67cd9e1e7b671c946741d3f7c (patch) | |
| tree | 911a2b739d9f737cac2b7197c3e2df8015bd67c9 /mysql-test | |
| parent | 2ae3fca46536245fd2d7f33f317a9fb3a3097620 (diff) | |
| download | mariadb-git-e10816118a35cdb67cd9e1e7b671c946741d3f7c.tar.gz | |
Update handler status variables after the last commit.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/myisam_mrr.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/status.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/status_user.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/myisam_mrr.test | 1 |
4 files changed, 14 insertions, 4 deletions
diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/r/myisam_mrr.result index 0eeb22d829a..4bb0e29a26e 100644 --- a/mysql-test/r/myisam_mrr.result +++ b/mysql-test/r/myisam_mrr.result @@ -628,9 +628,9 @@ sum(t1.b) 1230 show status like 'handler_mrr%'; Variable_name Value -Handler_mrr_extra_key_sorts 1 -Handler_mrr_extra_rowid_sorts 1 -Handler_mrr_init 2 +Handler_mrr_extra_key_sorts 1or2 +Handler_mrr_extra_rowid_sorts 1or2 +Handler_mrr_init 1or2 set join_cache_level= @join_cache_level_save; set join_buffer_size= @join_buffer_size_save; drop table t0, t1; diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index b0744726390..c9602ddb8f6 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -275,6 +275,9 @@ Variable_name Value Handler_commit 0 Handler_delete 0 Handler_discover 0 +Handler_mrr_extra_key_sorts 0 +Handler_mrr_extra_rowid_sorts 0 +Handler_mrr_init 0 Handler_prepare 0 Handler_read_first 0 Handler_read_key 4 @@ -297,7 +300,7 @@ Created_tmp_files 0 Created_tmp_tables 2 Handler_tmp_update 2 Handler_tmp_write 7 -Rows_tmp_read 35 +Rows_tmp_read 38 drop table t1; CREATE TABLE t1 (i int(11) DEFAULT NULL, KEY i (i) ) ENGINE=MyISAM; insert into t1 values (1),(2),(3),(4),(5); @@ -310,6 +313,9 @@ Variable_name Value Handler_commit 0 Handler_delete 0 Handler_discover 0 +Handler_mrr_extra_key_sorts 0 +Handler_mrr_extra_rowid_sorts 0 +Handler_mrr_init 0 Handler_prepare 0 Handler_read_first 0 Handler_read_key 2 diff --git a/mysql-test/r/status_user.result b/mysql-test/r/status_user.result index 17c44df1d3c..470c1625b55 100644 --- a/mysql-test/r/status_user.result +++ b/mysql-test/r/status_user.result @@ -100,6 +100,9 @@ Variable_name Value Handler_commit 19 Handler_delete 1 Handler_discover 0 +Handler_mrr_extra_key_sorts 0 +Handler_mrr_extra_rowid_sorts 0 +Handler_mrr_init 0 Handler_prepare 18 Handler_read_first 0 Handler_read_key 3 diff --git a/mysql-test/t/myisam_mrr.test b/mysql-test/t/myisam_mrr.test index 0f916299ae7..28385c61b0f 100644 --- a/mysql-test/t/myisam_mrr.test +++ b/mysql-test/t/myisam_mrr.test @@ -313,6 +313,7 @@ set join_buffer_size=10; explain select sum(t1.b) from t0,t1 where t0.a=t1.a; flush status; select sum(t1.b) from t0,t1 where t0.a=t1.a; +--replace_result 1 1or2 2 1or2 show status like 'handler_mrr%'; set join_cache_level= @join_cache_level_save; |