Better fix for myisamchk --sort-index on windows

Fixed deadlock bug when doing resize of key buffer while key buffer was in active use


myisam/mi_locking.c:
  Better fix for myisamchk --sort-index on windows
mysql-test/r/symlink.result:
  Update results
mysql-test/t/symlink.test:
  Update results
mysys/mf_keycache.c:
  Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
sql/ha_myisam.cc:
  simple optimization
sql/sql_show.cc:
  Fixed theoretical buffer overrun
  Reset variable properly before calling update_create_info()

1 files changed, 2 insertions, 0 deletions

diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
index d8bba12b645..5e1fe313a7e 100644
--- a/mysql-test/t/symlink.test
+++ b/mysql-test/t/symlink.test
@@ -46,6 +46,7 @@ check table t9;
 optimize table t9;
 repair table t9;
 alter table t9 add column c int not null;
+--replace_result $MYSQL_TEST_DIR TEST_DIR
 show create table t9;
 
 # Test renames
@@ -86,5 +87,6 @@ enable_query_log;
 
 alter table t9 rename mysqltest.t9;
 select count(*) from mysqltest.t9;
+--replace_result $MYSQL_TEST_DIR TEST_DIR
 show create table mysqltest.t9;
 drop database mysqltest;