Commit f90558d6 authored by unknown's avatar unknown

Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree)


BitKeeper/etc/logging_ok:
  auto-union
sql/mini_client.cc:
  Auto merged
client/mysqlbinlog.cc:
  use local file
mysql-test/t/myisam.test:
  Remove uncessesary drop table
sql/sql_parse.cc:
  Use local
sql/sql_repl.cc:
  use local
parents a6aeb627 409b8f35
...@@ -88,7 +88,6 @@ DROP TABLE t1; ...@@ -88,7 +88,6 @@ DROP TABLE t1;
# in ha_myisam::repair, and index size is changed (decreased). # in ha_myisam::repair, and index size is changed (decreased).
# #
drop table if exists t1;
create table t1 ( t1 char(255), key(t1(250))); create table t1 ( t1 char(255), key(t1(250)));
insert t1 values ('137513751375137513751375137513751375137569516951695169516951695169516951695169'); insert t1 values ('137513751375137513751375137513751375137569516951695169516951695169516951695169');
insert t1 values ('178417841784178417841784178417841784178403420342034203420342034203420342034203'); insert t1 values ('178417841784178417841784178417841784178403420342034203420342034203420342034203');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment