Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/t/greedy_optimizer.test:
  Manual merge.
mysql-test/t/join.test:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

3 files changed, 12 insertions, 7 deletions

diff --git a/mysql-test/t/greedy_optimizer.test b/mysql-test/t/greedy_optimizer.test
index 4feca43ae1a..b73f70c6a3e 100644
--- a/mysql-test/t/greedy_optimizer.test
+++ b/mysql-test/t/greedy_optimizer.test
@@ -145,11 +145,11 @@ select @@optimizer_prune_level;
 #
 # These are the values for the parameters that control the greedy optimizer
 # (total 6 combinations - 3 for optimizer_search_depth, 2 for optimizer_prune_level):
-#
+# 3:
 # set optimizer_search_depth=0;  - automatic
 # set optimizer_search_depth=1;  - min
 # set optimizer_search_depth=62; - max (default)
-#
+# 2:
 # set optimizer_prune_level=0 - exhaustive;
 # set optimizer_prune_level=1 - heuristic; # default
 
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index 4d35989aa9a..14c98431970 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -512,10 +512,12 @@ select * from v1a join (t3 natural join t4) on a = y;
 #--------------------------------------------------------------------
 # Negative tests (tests for errors)
 #--------------------------------------------------------------------
+# works in Oracle - bug
 -- error 1052
-select * from t1 natural join (t3 cross join t4); # works in Oracle - bug
+select * from t1 natural join (t3 cross join t4);
+# works in Oracle - bug
 -- error 1052
-select * from (t3 cross join t4) natural join t1; # works in Oracle - bug
+select * from (t3 cross join t4) natural join t1;
 -- error 1052
 select * from t1 join (t2, t3) using (b);
 -- error 1052
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 0fff1bb71b5..e9943e8dca8 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -16079,7 +16079,8 @@ static void test_bug24179()
   Bug#28075 "COM_DEBUG crashes mysqld"
   Note: Test disabled because of failure in PushBuild.
 */
-#ifdef fix_bug_in_pb_first 
+#ifdef FIX_BUG_IN_PB_FIRST
+
 static void test_bug28075()
 {
   int rc;
@@ -16089,7 +16090,7 @@ static void test_bug28075()
 
   rc= mysql_dump_debug_info(mysql);
   DIE_UNLESS(rc == 0);
-  
+
   rc= mysql_ping(mysql);
   DIE_UNLESS(rc == 0);
 
@@ -16101,6 +16102,7 @@ static void test_bug28075()
 /*
   Bug#27876 (SF with cyrillic variable name fails during execution (regression))
 */
+
 static void test_bug27876()
 {
   int rc;
@@ -16165,6 +16167,7 @@ static void test_bug27876()
   Bug#28505: mysql_affected_rows() returns wrong value if CLIENT_FOUND_ROWS
   flag is set.
 */
+
 static void test_bug28505()
 {
   my_ulonglong res;
@@ -16554,7 +16557,7 @@ static struct my_tests_st my_tests[]= {
   { "test_status",   test_status   },
   { "test_bug24179", test_bug24179 },
   { "test_ps_query_cache", test_ps_query_cache },
-#ifdef fix_bug_in_pb_first 
+#ifdef FIX_BUG_IN_PB_FIRST
   { "test_bug28075", test_bug28075 },
 #endif
   { "test_bug27876", test_bug27876 },