Added some dummy initializations to keep gcc 4.1.2-44 silent about

bjornmu · bjornmu · commit 9964962cf15d · 2012-01-24T12:24:54.000+01:00
use of possibly uninitialized variabes.
The logic ensured that these were not actually referenced except under
  conditions where they had also been initialized,
  but gcc could not determine that (or likely didn't even try)
Without these, build breaks with -Werror
  using gcc 4.1.2-44 but works with 4.1.2-42
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
@@ -1737,7 +1737,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
     if (action->wait_for.length())
     {
       mysql_mutex_t *old_mutex;
-      mysql_cond_t  *old_cond;
+      mysql_cond_t  *old_cond= 0;
       int             error= 0;
       struct timespec abstime;
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -3620,6 +3620,9 @@ class Plan_change_watchdog
   */
   Plan_change_watchdog(const JOIN_TAB *tab_arg, bool no_changes_arg)
   {
+    // Only to keep gcc 4.1.2-44 silent about uninitialized variables
+    quick= NULL;
+    quick_index= 0;
     if (no_changes_arg)
     {
       tab= tab_arg;
@@ -3633,7 +3636,14 @@ class Plan_change_watchdog
       index= tab->index;
     }
     else
+    {
       tab= NULL;
+      // Only to keep gcc 4.1.2-44 silent about uninitialized variables
+      type= JT_UNKNOWN;
+      select= NULL;
+      ref_key= ref_key_parts= index= 0;
+      use_quick= QS_NONE;
+    }
   }
   ~Plan_change_watchdog()
   {

Original file line number	Diff line number	Diff line change
`@@ -1737,7 +1737,7 @@ static void debug_sync_execute(THD thd, st_debug_sync_action action)`
`1737`	`1737`	`if (action->wait_for.length())`
`1738`	`1738`	`{`
`1739`	`1739`	`mysql_mutex_t *old_mutex;`
`1740`		`- mysql_cond_t *old_cond;`
	`1740`	`+ mysql_cond_t *old_cond= 0;`
`1741`	`1741`	`int error= 0;`
`1742`	`1742`	`struct timespec abstime;`
`1743`	`1743`
Original file line number	Diff line number	Diff line change
`@@ -3620,6 +3620,9 @@ class Plan_change_watchdog`
`3620`	`3620`	`*/`
`3621`	`3621`	`Plan_change_watchdog(const JOIN_TAB *tab_arg, bool no_changes_arg)`
`3622`	`3622`	`{`
	`3623`	`+ // Only to keep gcc 4.1.2-44 silent about uninitialized variables`
	`3624`	`+ quick= NULL;`
	`3625`	`+ quick_index= 0;`
`3623`	`3626`	`if (no_changes_arg)`
`3624`	`3627`	`{`
`3625`	`3628`	`tab= tab_arg;`
`@@ -3633,7 +3636,14 @@ class Plan_change_watchdog`
`3633`	`3636`	`index= tab->index;`
`3634`	`3637`	`}`
`3635`	`3638`	`else`
	`3639`	`+ {`
`3636`	`3640`	`tab= NULL;`
	`3641`	`+ // Only to keep gcc 4.1.2-44 silent about uninitialized variables`
	`3642`	`+ type= JT_UNKNOWN;`
	`3643`	`+ select= NULL;`
	`3644`	`+ ref_key= ref_key_parts= index= 0;`
	`3645`	`+ use_quick= QS_NONE;`
	`3646`	`+ }`
`3637`	`3647`	`}`
`3638`	`3648`	`~Plan_change_watchdog()`
`3639`	`3649`	`{`