- Clean up function for my_uuid()

- Merge fixes - "make test" for maria - Replaced ma_test_all with a perl version, which now can be run in unittest mode. include/my_sys.h: Added clean up function for my_uuid() mysql-test/r/create.result: Fixed result file. mysql-test/r/maria-big.result: Changed not to get a warning. mysql-test/r/maria-connect.result: Not to get a warning. mysql-test/r/maria-recovery.result: Not to get a warning. mysql-test/r/maria.result: Fixed result file. Added test for warning on log file. mysql-test/r/ps_maria.result: Fixed result file. New bit was added to source. mysql-test/t/maria-big.test: To avoid a warning. mysql-test/t/maria-connect.test: To avoid a warning. mysql-test/t/maria-recovery.test: To avoid a warning. mysql-test/t/maria.test: To avoid a warning. mysql-test/t/ps_maria.test: To avoid a warning. mysys/my_uuid.c: Added clean up function for my_uuid() sql/mysqld.cc: Manual merge. storage/maria/Makefile.am: Added "make test" for maria. storage/maria/ma_key_recover.c: Fix for maria_recovery storage/maria/ma_test_all.sh: Deprecated file. Functionality moved to unittest/ma_test_all-t BitKeeper/deleted/.del-unit.pl: BitKeeper file /home/my/mysql-maria/storage/maria/unit.pl

- Clean up function for my_uuid()
- Merge fixes - "make test" for maria - Replaced ma_test_all with a perl version, which now can be run in unittest mode. include/my_sys.h: Added clean up function for my_uuid() mysql-test/r/create.result: Fixed result file. mysql-test/r/maria-big.result: Changed not to get a warning. mysql-test/r/maria-connect.result: Not to get a warning. mysql-test/r/maria-recovery.result: Not to get a warning. mysql-test/r/maria.result: Fixed result file. Added test for warning on log file. mysql-test/r/ps_maria.result: Fixed result file. New bit was added to source. mysql-test/t/maria-big.test: To avoid a warning. mysql-test/t/maria-connect.test: To avoid a warning. mysql-test/t/maria-recovery.test: To avoid a warning. mysql-test/t/maria.test: To avoid a warning. mysql-test/t/ps_maria.test: To avoid a warning. mysys/my_uuid.c: Added clean up function for my_uuid() sql/mysqld.cc: Manual merge. storage/maria/Makefile.am: Added "make test" for maria. storage/maria/ma_key_recover.c: Fix for maria_recovery storage/maria/ma_test_all.sh: Deprecated file. Functionality moved to unittest/ma_test_all-t BitKeeper/deleted/.del-unit.pl: BitKeeper file /home/my/mysql-maria/storage/maria/unit.pl
389dcccb · unknown · 765caec2 · 389dcccb · 389dcccb · 389dcccb
Commit 389dcccb authored Dec 18, 2007 by unknown
17 changed files
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -927,6 +927,7 @@ int my_msync(int, void *, size_t, int);
 #define MY_UUID_SIZE 16
 void my_uuid_init(ulong seed1, ulong seed2);
 void my_uuid(uchar *guid);
+void my_uuid_end();

 struct my_rnd_struct {
  unsigned long seed1,seed2,max_value;

--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1717,7 +1717,7 @@ t1	CREATE TABLE `t1` (
  `TIME` bigint(7) NOT NULL DEFAULT '0',
  `STATE` varchar(64) DEFAULT NULL,
  `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MARIA DEFAULT CHARSET=utf8
 drop table t1;
 create temporary table t1 like information_schema.processlist;
 show create table t1;
@@ -1731,7 +1731,7 @@ t1	CREATE TEMPORARY TABLE `t1` (
  `TIME` bigint(7) NOT NULL DEFAULT '0',
  `STATE` varchar(64) DEFAULT NULL,
  `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+) ENGINE=MARIA DEFAULT CHARSET=utf8
 drop table t1;
 create table t1 like information_schema.character_sets;
 show create table t1;

--- a/mysql-test/r/maria-big.result
+++ b/mysql-test/r/maria-big.result
 set storage_engine=maria;
 affected rows: 0
-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;
 affected rows: 0
 drop table if exists t1, t2;
 affected rows: 0

--- a/mysql-test/r/maria-connect.result
+++ b/mysql-test/r/maria-connect.result
 set global storage_engine=maria;
 set session storage_engine=maria;
-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;
 drop table if exists t1;
 SET SQL_WARNINGS=1;
 RESET MASTER;

--- a/mysql-test/r/maria-recovery.result
+++ b/mysql-test/r/maria-recovery.result
-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;
 drop database if exists mysqltest;
 create database mysqltest;
 use mysqltest;

--- a/mysql-test/r/maria.result
+++ b/mysql-test/r/maria.result
 set global storage_engine=maria;
 set session storage_engine=maria;
-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;
 drop table if exists t1,t2;
 SET SQL_WARNINGS=1;
 CREATE TABLE t1 (
@@ -1865,7 +1865,7 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 create table t1 (a int) row_format=dynamic transactional=1;
 Warnings:
-Note	1477	Row format set to PAGE because of TRANSACTIONAL=1 option
+Note	1478	Row format set to PAGE because of TRANSACTIONAL=1 option
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1879,7 +1879,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MARIA DEFAULT CHARSET=latin1 ROW_FORMAT=PAGE TRANSACTIONAL=1
 alter table t1 row_format=DYNAMIC;
 Warnings:
-Note	1477	Row format set to PAGE because of TRANSACTIONAL=1 option
+Note	1478	Row format set to PAGE because of TRANSACTIONAL=1 option
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2076,3 +2076,6 @@ create table t1 ( fid int not null auto_increment primary key,
 g geometry not null, spatial key(g));
 ERROR HY000: Maria can't yet handle SPATIAL or FULLTEXT keys in transactional mode. For now use TRANSACTIONAL=0
 drop table if exists t1;
+set global maria_log_file_size=4294967296;
+Warnings:
+Warning	1292	Truncated incorrect log_file_size value: '4294967296'
--- a/mysql-test/r/ps_maria.result
+++ b/mysql-test/r/ps_maria.result
-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;
 use test;
 drop table if exists t1, t9 ;
 create table t1
@@ -64,7 +64,7 @@ def	test	t9	t9	c11	c11	246	9	6	Y	0	4	63
 def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
-def	test	t9	t9	c15	c15	7	19	19	N	1249	0	63
+def	test	t9	t9	c15	c15	7	19	19	N	9441	0	63
 def	test	t9	t9	c16	c16	11	8	8	Y	128	0	63
 def	test	t9	t9	c17	c17	13	4	4	Y	32864	0	63
 def	test	t9	t9	c18	c18	1	4	1	Y	32768	0	63
@@ -784,20 +784,20 @@ a	b
 2	two
 3	three
 4	four
-prepare stmt1 from ' SELECT a as ccc from t1 where a+1=
-                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';
+prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=
+                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';
 execute stmt1 ;
 ccc
 1
 deallocate prepare stmt1 ;
-prepare stmt1 from ' SELECT a as ccc from t1 where a+1=
-                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';
+prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=
+                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';
 execute stmt1 ;
 ccc
 1
 deallocate prepare stmt1 ;
-prepare stmt1 from ' SELECT a as ccc from t1 where a+1=
-                           (SELECT 1+ccc from t1 where ccc+1=a+1 and a=1) ';
+prepare stmt1 from ' SELECT a as ccc from t1 outr where a+1=
+                           (SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1) ';
 execute stmt1 ;
 ccc
 1
@@ -2974,11 +2974,13 @@ Warnings:
 Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
+Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
+Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Note	1265	Data truncated for column 'c13' at row 1
@@ -3012,7 +3014,6 @@ Warning	1265	Data truncated for column 'c15' at row 1
 Warning	1264	Out of range value for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Note	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
 Warning	1264	Out of range value for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1

--- a/mysql-test/t/maria-big.test
+++ b/mysql-test/t/maria-big.test
@@ -2,7 +2,7 @@
 -- source include/have_maria.inc
 enable_info;
 set storage_engine=maria;
-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;
 disable_warnings;
 drop table if exists t1, t2;
 enable_warnings;

--- a/mysql-test/t/maria-connect.test
+++ b/mysql-test/t/maria-connect.test
@@ -9,7 +9,7 @@ let $default=`select @@global.storage_engine`;
 set global storage_engine=maria;
 set session storage_engine=maria;

-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;

 # Initialise
 --disable_warnings

--- a/mysql-test/t/maria-recovery.test
+++ b/mysql-test/t/maria-recovery.test
@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc

-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;

 --disable_warnings
 drop database if exists mysqltest;

--- a/mysql-test/t/maria.test
+++ b/mysql-test/t/maria.test
@@ -9,7 +9,7 @@ let $default=`select @@global.storage_engine`;
 set global storage_engine=maria;
 set session storage_engine=maria;

-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;

 # Initialise
 --disable_warnings
@@ -1318,6 +1318,13 @@ create table t1 ( fid int not null auto_increment primary key,
 g geometry not null, spatial key(g));
 drop table if exists t1;

+#
+# Test warning on log file size truncates
+#
+
+--enable_warnings
+set global maria_log_file_size=4294967296;
+
 # End of 5.2 tests

 --disable_result_log

--- a/mysql-test/t/ps_maria.test
+++ b/mysql-test/t/ps_maria.test
@@ -9,7 +9,7 @@
 #       BEFORE ADDING NEW TEST CASES HERE !!!

 -- source include/have_maria.inc
-set global maria_log_file_size=4294967296;
+set global maria_log_file_size=4294967295;

 use test;


--- a/mysys/my_uuid.c
+++ b/mysys/my_uuid.c
@@ -166,3 +166,13 @@ void my_uuid(uchar *to)
  int2store(to+6, time_hi_and_version);
  bmove(to+8, uuid_suffix, sizeof(uuid_suffix));
 }
+
+
+void my_uuid_end()
+{
+  if (my_uuid_inited)
+  {
+    my_uuid_inited= 0;
+    pthread_mutex_destroy(&LOCK_uuid_generator);
+  }
+}
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -566,7 +566,7 @@ pthread_key(MEM_ROOT**,THR_MALLOC);
 pthread_key(THD*, THR_THD);
 pthread_mutex_t LOCK_mysql_create_db, LOCK_Acl, LOCK_open, LOCK_thread_count,
 		LOCK_mapped_file, LOCK_status, LOCK_global_read_lock,
-		LOCK_error_log, LOCK_uuid_generator,
+		LOCK_error_log,
 		LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create,
 		LOCK_crypt, LOCK_bytes_sent, LOCK_bytes_received,
 	        LOCK_global_system_variables,
@@ -1282,6 +1282,7 @@ void clean_up(bool print_message)
  /* do the broadcast inside the lock to ensure that my_end() is not called */
  (void) pthread_cond_broadcast(&COND_thread_count);
  (void) pthread_mutex_unlock(&LOCK_thread_count);
+  my_uuid_end();

  /*
    The following lines may never be executed as the main thread may have
@@ -1354,7 +1355,6 @@ static void clean_up_mutexes()
  (void) pthread_mutex_destroy(&LOCK_global_system_variables);
  (void) rwlock_destroy(&LOCK_system_variables_hash);
  (void) pthread_mutex_destroy(&LOCK_global_read_lock);
-  (void) pthread_mutex_destroy(&LOCK_uuid_generator);
  (void) pthread_mutex_destroy(&LOCK_prepared_stmt_count);
  (void) pthread_cond_destroy(&COND_thread_count);
  (void) pthread_cond_destroy(&COND_refresh);
@@ -3105,7 +3105,6 @@ static int init_thread_environment()
  (void) my_rwlock_init(&LOCK_system_variables_hash, NULL);
  (void) pthread_mutex_init(&LOCK_global_read_lock, MY_MUTEX_INIT_FAST);
  (void) pthread_mutex_init(&LOCK_prepared_stmt_count, MY_MUTEX_INIT_FAST);
-  (void) pthread_mutex_init(&LOCK_uuid_generator, MY_MUTEX_INIT_FAST);
 #ifdef HAVE_OPENSSL
  (void) pthread_mutex_init(&LOCK_des_key_file,MY_MUTEX_INIT_FAST);
 #ifndef HAVE_YASSL

--- a/storage/maria/Makefile.am
+++ b/storage/maria/Makefile.am
@@ -173,5 +173,13 @@ SUFFIXES = .sh
 tags:
 	etags *.h *.c *.cc

+unittests = unittest
+
+test:
+	perl $(top_srcdir)/unittest/unit.pl run $(unittests)
+
+test-verbose:
+	HARNESS_VERBOSE=1 perl $(top_srcdir)/unittest/unit.pl run $(unittests)
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%
--- a/storage/maria/ma_key_recover.c
+++ b/storage/maria/ma_key_recover.c
@@ -603,6 +603,7 @@ uint _ma_apply_redo_index_new_page(MARIA_HA *info, LSN lsn,
  }

  /* Write modified page */
+  bzero(buff, LSN_STORE_SIZE);
  memcpy(buff + LSN_STORE_SIZE, header, length);
  bzero(buff + LSN_STORE_SIZE + length,
        share->block_size - LSN_STORE_SIZE - KEYPAGE_CHECKSUM_SIZE - length);

--- a/storage/maria/ma_test_all.sh
+++ b/storage/maria/ma_test_all.sh
 #!/bin/sh
 #
-# Execute some simple basic test on MyISAM libary to check if things
-# works at all.
-
-# If you want to run this in Valgrind, you should use --trace-children=yes,
-# so that it detects problems in ma_test* and not in the shell script
-
-# Running in a "shared memory" disk is 10 times faster; you can do
-# mkdir /dev/shm/test; cd /dev/shm/test; maria_path=<path_to_maria_binaries>
-
-# Remove # from following line if you need some more information
-#set -x -v -e
-
-set -e # abort at first failure
-
-valgrind="valgrind --alignment=8 --leak-check=yes"
-silent="-s"
-suffix=""
-if [ -z "$maria_path" ]
-then
-    maria_path="."
-fi
-
-# Delete temporary files
-rm -f *.TMD
-rm -f maria_log*
-
-run_tests()
-{
-  row_type=$1
-  #
-  # First some simple tests
-  #
-  $maria_path/ma_test1$suffix $silent $row_type
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/ma_test1$suffix $silent -N $row_type
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/ma_test1$suffix $silent -P --checksum $row_type
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/ma_test1$suffix $silent -P -N $row_type
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/ma_test1$suffix $silent -B -N -R2 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -k 480 --unique $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -N -R1 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -p $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -p -N --unique $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -p -N --key_length=127 --checksum $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -p -N --key_length=128 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -p --key_length=480 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -B $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -B --key_length=64  --unique $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -B -k 480 --checksum $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -B -k 480 -N  --unique --checksum $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -m $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -m -P --unique --checksum $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -m -P --key_length=480 --key_cache $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -m -p $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -w --unique $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -w --key_length=64 --checksum $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -w -N --key_length=480 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -w --key_length=480 --checksum $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -b -N $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -a -b --key_length=480 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent -p -B --key_length=480 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent --checksum --unique $row_type
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/ma_test1$suffix $silent --unique $row_type
-  $maria_path/maria_chk$suffix -se test1
-    
-  $maria_path/ma_test1$suffix $silent --key_multiple -N -S $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent --key_multiple -a -p --key_length=480 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent --key_multiple -a -B --key_length=480 $row_type
-  $maria_path/maria_chk$suffix -sm test1
-  $maria_path/ma_test1$suffix $silent --key_multiple -P -S $row_type
-  $maria_path/maria_chk$suffix -sm test1
- 
-  $maria_path/maria_pack$suffix --force -s test1
-  $maria_path/maria_chk$suffix -ess test1
-  
-  $maria_path/ma_test2$suffix $silent -L -K -W -P $row_type
-  $maria_path/maria_chk$suffix -sm test2
-  $maria_path/ma_test2$suffix $silent -L -K -W -P -A $row_type
-  $maria_path/maria_chk$suffix -sm test2
-  $maria_path/ma_test2$suffix $silent -L -K -P -R3 -m50 -b1000000 $row_type
-  $maria_path/maria_chk$suffix -sm test2
-  $maria_path/ma_test2$suffix $silent -L -B $row_type
-  $maria_path/maria_chk$suffix -sm test2
-  $maria_path/ma_test2$suffix $silent -D -B -c $row_type
-  $maria_path/maria_chk$suffix -sm test2
-  rm -f maria_log_control maria_log.*
-  $maria_path/ma_test2$suffix $silent -m10000 -e4096 -K $row_type
-  $maria_path/maria_chk$suffix -sm test2
-  rm -f maria_log_control maria_log.*
-  $maria_path/ma_test2$suffix $silent -m10000 -e8192 -K $row_type -P
-  $maria_path/maria_chk$suffix -sm test2
-  rm -f maria_log_control maria_log.*
-  $maria_path/ma_test2$suffix $silent -m10000 -e16384 -E16384 -K -L $row_type
-  $maria_path/maria_chk$suffix -sm test2
-  rm -f maria_log_control maria_log.*
-  $maria_path/ma_test2$suffix $silent -c -b65000 $row_type
-  $maria_path/maria_chk$suffix -se test2
-}
-
-run_repair_tests()
-{
-  row_type=$1
-  $maria_path/ma_test1$suffix $silent --checksum $row_type
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/maria_chk$suffix --silent -re --transaction-log test1
-  $maria_path/maria_chk$suffix -rs test1
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/maria_chk$suffix -rqs test1
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/maria_chk$suffix -rs --correct-checksum test1
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/maria_chk$suffix -rqs --correct-checksum test1
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/maria_chk$suffix -ros --correct-checksum test1
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/maria_chk$suffix -rqos --correct-checksum test1
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/ma_test2$suffix $silent -c -d1 $row_type
-  $maria_path/maria_chk$suffix -s --parallel-recover test2
-  $maria_path/maria_chk$suffix -se test2
-  $maria_path/maria_chk$suffix -s --parallel-recover --quick test2
-  $maria_path/maria_chk$suffix -se test2
-  $maria_path/ma_test2$suffix $silent -c $row_type
-  $maria_path/maria_chk$suffix -se test2
-  $maria_path/maria_chk$suffix -sr test2
-  $maria_path/maria_chk$suffix -se test2
-}
-
-run_pack_tests()
-{
-  row_type=$1
-  # check of maria_pack / maria_chk
-  $maria_path/ma_test1$suffix $silent --checksum $row_type
-  $maria_path/maria_pack$suffix --force -s test1
-  $maria_path/maria_chk$suffix -ess test1
-  $maria_path/maria_chk$suffix -rqs test1
-  $maria_path/maria_chk$suffix -es test1
-  $maria_path/maria_chk$suffix -rs test1
-  $maria_path/maria_chk$suffix -es test1
-  $maria_path/maria_chk$suffix -rus test1
-  $maria_path/maria_chk$suffix -es test1
-  
-  $maria_path/ma_test1$suffix $silent --checksum $row_type
-  $maria_path/maria_pack$suffix --force -s test1
-  $maria_path/maria_chk$suffix -rus --safe-recover test1
-  $maria_path/maria_chk$suffix -es test1
-
-  $maria_path/ma_test1$suffix $silent --checksum -S $row_type
-  $maria_path/maria_chk$suffix -se test1
-  $maria_path/maria_chk$suffix -ros test1
-  $maria_path/maria_chk$suffix -rqs test1
-  $maria_path/maria_chk$suffix -se test1
-  
-  $maria_path/maria_pack$suffix --force -s test1
-  $maria_path/maria_chk$suffix -rqs test1
-  $maria_path/maria_chk$suffix -es test1
-  $maria_path/maria_chk$suffix -rus test1
-  $maria_path/maria_chk$suffix -es test1
-
-  $maria_path/ma_test2$suffix $silent -c -d1 $row_type
-  $maria_path/maria_chk$suffix -s --parallel-recover test2
-  $maria_path/maria_chk$suffix -se test2
-  $maria_path/maria_chk$suffix -s --unpack --parallel-recover test2
-  $maria_path/maria_chk$suffix -se test2
-  $maria_path/maria_pack$suffix --force -s test1
-  $maria_path/maria_chk$suffix -s --unpack --parallel-recover test2
-  $maria_path/maria_chk$suffix -se test2
-}
-
-echo "Running tests with dynamic row format"
-run_tests ""
-run_repair_tests ""
-run_pack_tests ""
-
-echo "Running tests with static row format"
-run_tests -S
-run_repair_tests -S
-run_pack_tests -S
-
-echo "Running tests with block row format"
-run_tests -M
-run_repair_tests -M
-run_pack_tests -M
-
-echo "Running tests with block row format and transactions"
-run_tests "-M -T"
-run_repair_tests "-M -T"
-run_pack_tests "-M -T"
-
-#
-# Tests that gives warnings or errors
-#
-
-$maria_path/ma_test2$suffix $silent -L -K -W -P -S -R1 -m500
-$maria_path/maria_chk$suffix -sm test2
-echo "ma_test2$suffix $silent -L -K -R1 -m2000 ;  Should give error 135"
-$maria_path/ma_test2$suffix $silent -L -K -R1 -m2000 >ma_test2_message.txt 2>&1 && false # success is failure
-cat ma_test2_message.txt
-grep "Error: 135" ma_test2_message.txt > /dev/null
-echo "$maria_path/maria_chk$suffix -sm test2 will warn that 'Datafile is almost full'"
-$maria_path/maria_chk$suffix -sm test2 >ma_test2_message.txt 2>&1
-cat ma_test2_message.txt
-grep "warning: Datafile is almost full" ma_test2_message.txt >/dev/null
-rm -f ma_test2_message.txt
-$maria_path/maria_chk$suffix -ssm test2
-
-#
-# Test that removing tables and applying the log leads to identical tables
+# This file is now deprecated and has been replaced by
+# unittest/ma_test_all-t
 #
-/bin/sh $maria_path/ma_test_recovery

-#
-# Extra tests that has caused failures in the past
-#
-
-# Problem with re-executing CLR's
-rm -f maria_log.* maria_log_control
-$maria_path/ma_test2 -s -L -K -W -P -M -T -c -b -t2 -u1
-cp maria_log_control tmp
-$maria_path/maria_read_log -a -s
-$maria_path/maria_chk -s -e test2
-cp tmp/maria_log_control .
-rm test2.MA?
-$maria_path/maria_read_log -a -s
-$maria_path/maria_chk -s -e test2
-
-# Problem with re-executing CLR's
-rm -f maria_log.* maria_log_control
-$maria_path/ma_test2 -s -L -K -W -P -M -T -c -b -t2 -u1
-$maria_path/maria_read_log -a -s
-$maria_path/maria_chk -s -e test2
-rm test2.MA?
-$maria_path/maria_read_log -a -s
-$maria_path/maria_chk -e -s test2
-
-#
-# Some timing tests
-#
-#time $maria_path/ma_test2$suffix $silent
-#time $maria_path/ma_test2$suffix $silent -S
-#time $maria_path/ma_test2$suffix $silent -M
-#time $maria_path/ma_test2$suffix $silent -B
-#time $maria_path/ma_test2$suffix $silent -L
-#time $maria_path/ma_test2$suffix $silent -K
-#time $maria_path/ma_test2$suffix $silent -K -B
-#time $maria_path/ma_test2$suffix $silent -L -B
-#time $maria_path/ma_test2$suffix $silent -L -K -B
-#time $maria_path/ma_test2$suffix $silent -L -K -W -B
-#time $maria_path/ma_test2$suffix $silent -L -K -W -B -S
-#time $maria_path/ma_test2$suffix $silent -L -K -W -B -M
-#time $maria_path/ma_test2$suffix $silent -D -K -W -B -S
+./unittest/ma_test_all-t