diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 16:51:12 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-14 16:51:12 -0700 |
| commit | 3a5064205f12528b67b98ebc153bde43de6b6583 (patch) | |
| tree | 10b32a7bdd80103a62aca53e2e55f8431f9dc742 /mysql-test/t | |
| parent | 46e1b71f68031ba249c375bbc71ae0355af71acd (diff) | |
| parent | a6f4c958cae1f75db34f371a4939d94d67348e98 (diff) | |
| download | mariadb-git-3a5064205f12528b67b98ebc153bde43de6b6583.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/41
into siva.hindu.god:/usr/home/tim/m/bk/50
mysql-test/r/myisam.result:
Manual merge.
mysql-test/r/symlink.result:
Manual merge.
mysql-test/t/myisam.test:
Manual merge.
mysql-test/t/symlink.test:
Manual merge.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/myisam.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/symlink.test | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 90b71a30c27..2b498704512 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -846,6 +846,10 @@ DROP TABLE t1; # SET @@myisam_repair_threads=1; SHOW VARIABLES LIKE 'myisam_repair%'; + +--echo End of 4.1 tests + + # Test varchar # @@ -970,4 +974,4 @@ create table t3 (c1 int) engine=myisam pack_keys=default; create table t4 (c1 int) engine=myisam pack_keys=2; drop table t1, t2, t3; -# End of 4.1 tests +--echo End of 5.0 tests diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test index 94890eab93d..7924f00a9c8 100644 --- a/mysql-test/t/symlink.test +++ b/mysql-test/t/symlink.test @@ -176,4 +176,6 @@ connection default; select * from t1; drop table t1; -# End of 4.1 tests +--echo End of 4.1 tests + +--echo End of 5.0 tests |