1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work:/home/bk/mysql-4.0

Browse Source 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
unknown 2002-11-09 20:29:22 +01:00
commit dce4b2c958
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.bzrignore
View File

@ -193,6 +193,7 @@ configure
core core
db-*.*.* db-*.*.*
dbug/user.t dbug/user.t
depcomp
extra/comp_err extra/comp_err
extra/my_print_defaults extra/my_print_defaults
extra/mysql_install extra/mysql_install
@ -211,6 +212,7 @@ innobase/conftest.s1
innobase/conftest.subs innobase/conftest.subs
innobase/ib_config.h innobase/ib_config.h
innobase/ib_config.h.in innobase/ib_config.h.in
innobase/stamp-h1
isam/isamchk isam/isamchk
isam/isamlog isam/isamlog
isam/pack_isam isam/pack_isam
@ -468,6 +470,7 @@ sql/sql_yacc.cc
sql/sql_yacc.h sql/sql_yacc.h
stamp-h stamp-h
stamp-h.in stamp-h.in
stamp-h1
strings/conf_to_src strings/conf_to_src
strings/ctype_autoconf.c strings/ctype_autoconf.c
strings/ctype_extra_sources.c strings/ctype_extra_sources.c
@ -494,5 +497,3 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
innobase/stamp-h1
stamp-h1

6
mysql-test/r/isam.result
View File

@ -47,14 +47,14 @@ test.t1 optimize status OK
check table t1,t2; check table t1,t2;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
test.t2 check error The handler for the table doesn't support check/repair test.t2 check error The handler for the table doesn't support check
repair table t1,t2; repair table t1,t2;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair status OK
test.t2 repair error The handler for the table doesn't support check/repair test.t2 repair error The handler for the table doesn't support repair
check table t2,t1; check table t2,t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t2 check error The handler for the table doesn't support check/repair test.t2 check error The handler for the table doesn't support check
test.t1 check status OK test.t1 check status OK
lock tables t1 write; lock tables t1 write;
check table t2,t1; check table t2,t1;

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

@ -1331,10 +1331,10 @@ table type possible_keys key key_len ref rows Extra
t2 ref fld3 fld3 30 const 1 Using where; Using index t2 ref fld3 fld3 30 const 1 Using where; Using index
explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle'; explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle';
table type possible_keys key key_len ref rows Extra table type possible_keys key key_len ref rows Extra
t2 index NULL fld3 30 NULL 1199 Using where; Using index t2 ALL NULL NULL NULL NULL 1199 Using where
explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle'; explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle';
table type possible_keys key key_len ref rows Extra table type possible_keys key key_len ref rows Extra
t2 index NULL fld3 30 NULL 1199 Using where; Using index t2 ALL NULL NULL NULL NULL 1199 Using where
explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle'; explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle';
table type possible_keys key key_len ref rows Extra table type possible_keys key key_len ref rows Extra
t2 ref fld3 fld3 30 const 1 Using where; Using index t2 ref fld3 fld3 30 const 1 Using where; Using index

1
sql/sql_base.cc
View File

@ -1844,6 +1844,7 @@ bool setup_tables(TABLE_LIST *tables)
DBUG_RETURN(1); DBUG_RETURN(1);
table->keys_in_use_for_query &= ~map; table->keys_in_use_for_query &= ~map;
} }
table->used_keys &= table->keys_in_use_for_query;
if (table_list->shared) if (table_list->shared)
{ {
/* Clear query_id that may have been set by previous select */ /* Clear query_id that may have been set by previous select */