Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged

mysql-test/r/loaddata.result

@@ -180,7 +180,7 @@ insert into t2 values(1),(2);
 Warnings:
 Warning	1261	Row 1 doesn't contain data for all columns
 Warning	1261	Row 2 doesn't contain data for all columns
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 f1
 1
 2
@@ -188,7 +188,7 @@ delete from t1;
 Warnings:
 Warning	1261	Row 1 doesn't contain data for all columns
 Warning	1261	Row 2 doesn't contain data for all columns
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 f1
 1
 2

mysql-test/t/loaddata.test

@@ -168,7 +168,7 @@ disable_query_log;
 eval select * into outfile '$MYSQLTEST_VARDIR/tmp/t2' from t2;
 eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1;
 enable_query_log;
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 --exec rm $MYSQLTEST_VARDIR/tmp/t2
 delete from t1;
 disable_query_log;
@@ -178,7 +178,7 @@ FROM t2;
 eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1
 FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';
 enable_query_log;
-select f1 from t1 where f2 <> '0000-00-00 00:00:00';
+select f1 from t1 where f2 <> '0000-00-00 00:00:00' order by f1;
 --exec rm $MYSQLTEST_VARDIR/tmp/t2
 drop table t1,t2;