diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-08-25 17:19:44 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-08-25 17:19:44 +0300 |
| commit | 413b57e14c23b42b1068fd6a95a5e1296029acd1 (patch) | |
| tree | 28a19e92b8ac6f4ca2691bb1c3ae3056a65b006c /mysql-test | |
| parent | e8007ae77b20a6c51daaa47da78c65fe0b0fdac8 (diff) | |
| download | mariadb-git-413b57e14c23b42b1068fd6a95a5e1296029acd1.tar.gz | |
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()
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/symlink.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/symlink.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index ab699ac4c4e..2deecae7243 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -40,7 +40,7 @@ t9 CREATE TABLE `t9` ( `b` char(16) NOT NULL default '', `c` int(11) NOT NULL default '0', PRIMARY KEY (`a`) -) TYPE=MyISAM +) TYPE=MyISAM DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/' alter table t9 rename t8, add column d int not null; alter table t8 rename t7; rename table t7 to t9; @@ -62,5 +62,5 @@ t9 CREATE TABLE `t9` ( `c` int(11) NOT NULL default '0', `d` int(11) NOT NULL default '0', PRIMARY KEY (`a`) -) TYPE=MyISAM +) TYPE=MyISAM DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/' drop database mysqltest; 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; |