Fix for IO_CACHE.

Portability fixes.


BUILD/compile-alpha-debug:
  Update to newer version
libmysqld/lib_vio.c:
  dbug_assert -> DBUG_ASSERT
mysql-test/r/symlink.result:
  Update for new tests
mysql-test/t/symlink.test:
  Update for new test format
mysys/mf_iocache2.c:
  Fixed bug when reading in old buffer
sql-bench/test-transactions.sh:
  Update with delete tests
sql/mysqld.cc:
  Updates for amiga
sql/sql_string.cc:
  Fix typo
sql/stacktrace.c:
  Portability fix

2 files changed, 17 insertions, 18 deletions

diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index 3f8132d2296..5626bc0fe11 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -21,7 +21,6 @@ insert into t1 (b) select b from t2;
 insert into t2 (b) select b from t1;
 insert into t1 (b) select b from t2;
 drop table t2;
- create table t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="/home/sasha/bk/mysql-4.0/mysql-test/var/tmp" index directory="/home/sasha/bk/mysql-4.0/mysql-test/var/run";
 insert into t9 select * from t1;
 check table t9;
 Table	Op	Msg_type	Msg_text
@@ -45,18 +44,11 @@ alter table t9 rename t8, add column d int not null;
 alter table t8 rename t7;
 rename table t7 to t9;
 drop table t1;
-create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="tmp";
-Incorrect table name 'tmp'
-drop database if exists test_mysqltest;
-create database test_mysqltest;
-create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="/this-dir-does-not-exist";
-Can't create/write to file '/this-dir-does-not-exist/t9.MYI' (Errcode: 2)
-create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="not-hard-path";
-Incorrect table name 'not-hard-path'
- create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="/home/sasha/bk/mysql-4.0/mysql-test/var/run";
-Can't create/write to file '/home/sasha/bk/mysql-4.0/mysql-test/var/run/t9.MYI' (Errcode: 17)
- create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="/home/sasha/bk/mysql-4.0/mysql-test/var/tmp";
-Can't create/write to file '/home/sasha/bk/mysql-4.0/mysql-test/var/tmp/t9.MYD' (Errcode: 17)
+Got one of the listed errors
+Got one of the listed errors
+Got one of the listed errors
+Got one of the listed errors
+Got one of the listed errors
 alter table t9 rename test_mysqltest.t9;
 select count(*) from test_mysqltest.t9;
 count(*)
diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
index 5e2b8232844..586761921b8 100644
--- a/mysql-test/t/symlink.test
+++ b/mysql-test/t/symlink.test
@@ -1,5 +1,7 @@
 -- require r/have_symlink.require
+disable_query_log;
 show variables like "have_symlink";
+enable_query_log;
 
 #
 # First create little data to play with
@@ -33,7 +35,10 @@ drop table t2;
 # We use t9 here to not crash with tables generated by the backup test
 # 
 
+disable_query_log;
 eval create table t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="$MYSQL_TEST_DIR/var/tmp" index directory="$MYSQL_TEST_DIR/var/run";
+enable_query_log;
+
 insert into t9 select * from t1;
 check table t9;
 optimize table t9;
@@ -53,7 +58,8 @@ drop table t1;
 # Note that we are using the above table t9 here!
 #
 
---error 1103
+disable_query_log;
+--error 1103,1103
 create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="tmp";
 
 # Check that we cannot link over a table from another database.
@@ -61,17 +67,18 @@ create table t1 (a int not null auto_increment, b char(16) not null, primary key
 drop database if exists test_mysqltest;
 create database test_mysqltest;
 
---error 1
+--error 1,1
 create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="/this-dir-does-not-exist";
 
---error 1103
+--error 1103,1103
 create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="not-hard-path";
 
---error 1
+--error 1,1
 eval create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="$MYSQL_TEST_DIR/var/run";
 
---error 1
+--error 1,1
 eval create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="$MYSQL_TEST_DIR/var/tmp";
+enable_query_log;
 
 # Check moving table t9 from default database to test_mysqltest;
 # In this case the symlinks should be removed.