database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge sinisa@work.mysql.com:/home/bk/mysql

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql
This commit is contained in:
unknown
2002-11-12 17:43:03 +02:00
parent 31201e6617 8c14ed4230
commit eae8e515b4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@@ -321,3 +321,4 @@ sql-bench/innotest1b
sql-bench/innotest2
sql-bench/innotest2a
sql-bench/innotest2b
depcomp

4
mysql-test/r/select.result
View File

@@ -94,9 +94,9 @@ fld3
table type possible_keys key key_len ref rows Extra
t2 ref fld3 fld3 30 const 1 where used; Using index
table type possible_keys key key_len ref rows Extra
t2 index fld3 fld3 30 NULL 1199 where used; Using index
t2 ALL fld3 NULL NULL NULL 1199 where used
table type possible_keys key key_len ref rows Extra
t2 index fld3 fld3 30 NULL 1199 where used; Using index
t2 ALL fld3 NULL NULL NULL 1199 where used
table type possible_keys key key_len ref rows Extra
t2 ref fld3 fld3 30 const 1 where used; Using index
table type possible_keys key key_len ref rows Extra

1
sql/sql_base.cc
View File

@@ -1834,6 +1834,7 @@ bool setup_tables(TABLE_LIST *tables)
DBUG_RETURN(1);
table->table->keys_in_use_for_query &= ~map;
}
table->table->used_keys &= table->table->keys_in_use_for_query;
}
if (tablenr > MAX_TABLES)
{