bzr push into mysql-6.0-backup branch (cbell:2665)

[Chuck Bell]

 2665 Chuck Bell	2008-07-14
      Another fix for sapsrv1 warnings.
modified:
  sql/sql_class.cc
  sql/sql_class.h

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-07-14 20:15:45 +0000
+++ b/sql/sql_class.cc	2008-07-14 20:59:52 +0000
@@ -529,14 +529,14 @@ THD::THD()
    derived_tables_processing(FALSE),
    spcont(NULL),
    m_lip(NULL),
-   DDL_exception(FALSE),
   /*
     @todo The following is a work around for online backup and the DDL blocker.
           It should be removed when the generalized solution is in place.
           This is needed to ensure the restore (which uses DDL) is not blocked
           when the DDL blocker is engaged.
   */
-   locked_tables_root(NULL)
+   locked_tables_root(NULL),
+   DDL_exception(FALSE)
 #if defined(ENABLED_DEBUG_SYNC)
    ,debug_sync_control(0)
 #endif /* defined(ENABLED_DEBUG_SYNC) */

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2008-07-09 07:12:43 +0000
+++ b/sql/sql_class.h	2008-07-14 20:59:52 +0000
@@ -1954,10 +1954,6 @@ public:
   unsigned long audit_class_mask[MYSQL_AUDIT_CLASS_MASK_SIZE];
 #endif
 
-#if defined(ENABLED_DEBUG_SYNC)
-  /* Debug Sync facility. See debug_sync.cc. */
-  struct st_debug_sync_control *debug_sync_control;
-#endif /* defined(ENABLED_DEBUG_SYNC) */
   /**
     Points to the memory root of Locked_tables_list if
     we're locking the tables for LOCK TABLES. Otherwise is NULL.
@@ -1965,6 +1961,11 @@ public:
     tables used in triggers will persist after statement end.
   */
   MEM_ROOT *locked_tables_root;
+
+#if defined(ENABLED_DEBUG_SYNC)
+  /* Debug Sync facility. See debug_sync.cc. */
+  struct st_debug_sync_control *debug_sync_control;
+#endif /* defined(ENABLED_DEBUG_SYNC) */
 
   THD();
   ~THD();