PBXT

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

  1. pbxt-20-build-problem-5131
  2. Merge into 2.0
Proposed by Vladimir Kolesnikov
Status: Merged
Merged at revision: 925
Proposed branch: lp:~vkolesnikov/pbxt/pbxt-20-build-problem-5131
Merge into: lp:pbxt/2.0
Diff against target: 23 lines (+5/-1)
1 file modified
src/discover_xt.cc (+5/-1)
To merge this branch: bzr merge lp:~vkolesnikov/pbxt/pbxt-20-build-problem-5131
Reviewer Review Type Date Requested Status
PBXT Core Pending
Review via email: mp+42091@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/discover_xt.cc'
2--- src/discover_xt.cc 2010-06-15 08:48:11 +0000
3+++ src/discover_xt.cc 2010-11-29 11:37:04 +0000
4@@ -1302,6 +1302,10 @@
5
6 mylex.create_info.frm_only = 1;
7 mylex.create_info.default_table_charset = system_charset_info;
8+
9+#if MYSQL_VERSION_ID > 50130
10+ partition_info *part_info= NULL;
11+#endif
12
13 /* setup the column info. */
14 while (info->field_name) {
15@@ -1350,7 +1354,7 @@
16
17 /* Create an internal temp table */
18 #if MYSQL_VERSION_ID > 50130
19- partition_info *part_info= thd->work_part_info;
20+ part_info= thd->work_part_info;
21
22 thd->work_part_info = NULL;
23 #endif

Subscribers

People subscribed via source and target branches