Merge with 4.0 tree

BitKeeper/etc/logging_ok:
  auto-union
scripts/Makefile.am:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
BUILD/compile-pentium-gcov:
  merge
myisam/mi_test2.c:
  use original code
mysql-test/t/range.test:
  Fixed comment
mysys/mf_keycache.c:
  Fixed comments
This commit is contained in:
unknown 2003-11-18 18:54:27 +02:00
commit 84281294ea
8 changed files with 11 additions and 7 deletions

View file

@ -223,7 +223,7 @@ INSERT INTO t1 VALUES
(21,4),(22,5),(23,5),(24,5),(25,5),(26,5),(30,5),(31,5),(32,5),(33,5),
(33,5),(33,5),(33,5),(33,5),(34,5),(35,5);
# we expect that optimizer will choose key on A
# we expect that optimizer will choose index on A
EXPLAIN SELECT * FROM t1 WHERE a IN(1,2) AND b=5;
SELECT * FROM t1 WHERE a IN(1,2) AND b=5;