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.

mysql-test/r/myisam.result

@@ -922,27 +922,7 @@ SET @@myisam_repair_threads=1;
 SHOW VARIABLES LIKE 'myisam_repair%';
 Variable_name	Value
 myisam_repair_threads	1
-show create table t1;
-Table	Create Table
-t1	CREATE TEMPORARY TABLE `t1` (
-  `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
-show create table t1;
-Table	Create Table
-t1	CREATE TEMPORARY TABLE `t1` (
-  `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'
-create table t1 (a int) engine=myisam select 42 a;
-select * from t1;
-a
-9
-select * from t1;
-a
-99
-select * from t1;
-a
-42
-drop table t1;
+End of 4.1 tests
 set storage_engine=MyISAM;
 drop table if exists t1,t2,t3;
 --- Testing varchar ---
@@ -1629,3 +1609,4 @@ create table t3 (c1 int) engine=myisam pack_keys=default;
 create table t4 (c1 int) engine=myisam pack_keys=2;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2' at line 1
 drop table t1, t2, t3;
+End of 5.0 tests

mysql-test/r/symlink.result

@@ -132,3 +132,4 @@ select * from t1;
 a
 42
 drop table t1;
+End of 4.1 tests

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

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