Merge lp:~vkolesnikov/pbxt/pbxt-20-build-problem-5131 into lp:pbxt/2.0

[Vladimir Kolesnikov]

I did not get any feedback from the original reporter so far, but I believe this fix will be useful anyway. The problem with build was that jumps to some labels bypassed local variable declarations.

=== modified file 'src/discover_xt.cc'
--- src/discover_xt.cc	2010-06-15 08:48:11 +0000
+++ src/discover_xt.cc	2010-11-29 11:37:04 +0000
@@ -1302,6 +1302,10 @@
 
 	mylex.create_info.frm_only = 1;
  	mylex.create_info.default_table_charset = system_charset_info;
+
+#if MYSQL_VERSION_ID > 50130
+        partition_info *part_info= NULL;
+#endif
 	
 	/* setup the column info. */
 	while (info->field_name) {		
@@ -1350,7 +1354,7 @@
 	
 	/* Create an internal temp table */
 #if MYSQL_VERSION_ID > 50130
-	partition_info *part_info= thd->work_part_info;
+	part_info= thd->work_part_info;
 	
 	thd->work_part_info = NULL;
 #endif