diff options
| author | unknown <igor@rurik.mysql.com> | 2003-08-26 15:14:13 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-08-26 15:14:13 -0700 |
| commit | 8ef37457ba170b423312bf079ab229a899529e6d (patch) | |
| tree | 378132b83ee612e66eeabde6e73c45ffea62ef28 /mysql-test/r/key_cache.result | |
| parent | f84aefc3daeef1134e79b7b16e8bf41c7943d745 (diff) | |
| download | mariadb-git-8ef37457ba170b423312bf079ab229a899529e6d.tar.gz | |
key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
After merge fix
sql/sql_lex.cc:
After merge fix
sql/set_var.cc:
After merge fix
sql/sql_yacc.yy:
After merge fix
sql/sql_lex.h:
After merge fix
mysql-test/r/key_cache.result:
After merge fix
Diffstat (limited to 'mysql-test/r/key_cache.result')
| -rw-r--r-- | mysql-test/r/key_cache.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result index acf2aa9641c..79fe0599bc4 100644 --- a/mysql-test/r/key_cache.result +++ b/mysql-test/r/key_cache.result @@ -77,7 +77,7 @@ select @@keycache1.key_cache_block_size; 0 select @@key_buffer_size; @@key_buffer_size -16777216 +2097152 select @@key_cache_block_size; @@key_cache_block_size 1024 @@ -121,7 +121,7 @@ i explain select count(*) from t1, t2 where t1.p = t2.i; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 2 Using index -1 SIMPLE t2 index k1 k1 5 NULL 4 Using where; Using index +1 SIMPLE t2 ref k1 k1 5 test.t1.p 2 Using where; Using index select count(*) from t1, t2 where t1.p = t2.i; count(*) 3 |