bk commit into 6.0 tree (cbell:1.2545)

[cbell]

Below is the list of changes that have just been committed into a local
6.0 repository of cbell.  When cbell does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-21 13:28:20-05:00, cbell@mysql_cab_desk. +3 -0
  Reverse of previous failed patches.

  mysql-test/t/disabled.def@stripped, 2008-02-21 13:28:14-05:00, cbell@mysql_cab_desk. +6 -0
    Reverse previous patch to reenable these tests. Tests are disabled
    pending BUG#34235 and WL#4259.

  sql/backup/debug.h@stripped, 2008-02-21 13:28:15-05:00, cbell@mysql_cab_desk. +1 -5
    Reverse of previous failed patch.

  sql/item_func.cc@stripped, 2008-02-21 13:28:15-05:00, cbell@mysql_cab_desk. +1 -1
    Reverse of previous failed patch.

diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-02-20 12:15:03 -05:00
+++ b/mysql-test/t/disabled.def	2008-02-21 13:28:14 -05:00
@@ -29,3 +29,9 @@ ps_ddl               : Bug#12093 2007-12
 user_limits          : Bug#23921 2007-12-16 random failure of user_limits.test
 ctype_latin2_ch	: BUG #33791 2008-01-18 mats Wrong ORDER BY with latin2_czech_cs
 query_cache_debug    : Bug#34424: query_cache_debug.test leads to valgrind warnings
+backup                :BUG#34235 pending replacement of test facility with WL#4259
+backup_commit_blocker :BUG#34235 pending replacement of test facility with WL#4259
+backup_ddl_blocker    :BUG#34235 pending replacement of test facility with WL#4259
+backup_progress       :BUG#34235 pending replacement of test facility with WL#4259
+backup_security       :BUG#34235 pending replacement of test facility with WL#4259
+backup_snapshot       :BUG#34235 pending replacement of test facility with WL#4259
diff -Nrup a/sql/backup/debug.h b/sql/backup/debug.h
--- a/sql/backup/debug.h	2008-02-20 06:42:31 -05:00
+++ b/sql/backup/debug.h	2008-02-21 13:28:15 -05:00
@@ -259,17 +259,13 @@ namespace backup {
 
  */
 
-#ifndef DBUG_OFF
-void debug_sync_point(const char* lock_name, uint lock_timeout);
-#endif
-
 /*
   Consider: set thd->proc_info when waiting on lock
 */
 #define BACKUP_BREAKPOINT(S) \
  do { \
   DBUG_PRINT("backup",("== breakpoint on '%s' ==",(S))); \
-  DBUG_EXECUTE_IF("backup_debug", debug_sync_point((S),BACKUP_BREAKPOINT_TIMEOUT);); \
+  DBUG_EXECUTE_IF("backup_debug", DBUG_SYNC_POINT((S),BACKUP_BREAKPOINT_TIMEOUT);); \
  } while (0)
 
 #endif
diff -Nrup a/sql/item_func.cc b/sql/item_func.cc
--- a/sql/item_func.cc	2008-02-20 12:15:05 -05:00
+++ b/sql/item_func.cc	2008-02-21 13:28:15 -05:00
@@ -3372,7 +3372,7 @@ longlong Item_master_pos_wait::val_int()
   return event_count;
 }
 
-#ifndef DBUG_OFF
+#ifdef EXTRA_DEBUG
 void debug_sync_point(const char* lock_name, uint lock_timeout)
 {
   THD* thd=current_thd;