PBXT

Merge lp:~vkolesnikov/pbxt/pbxt-drizzle-merge into lp:pbxt

  1. pbxt-drizzle-merge
  2. Merge into trunk
Proposed by Vladimir Kolesnikov
Status: Merged
Merged at revision: not available
Proposed branch: lp:~vkolesnikov/pbxt/pbxt-drizzle-merge
Merge into: lp:pbxt
Diff against target: 15 lines (+4/-1)
1 file modified
src/ha_pbxt.cc (+4/-1)
To merge this branch: bzr merge lp:~vkolesnikov/pbxt/pbxt-drizzle-merge
Reviewer Review Type Date Requested Status
PBXT Core Pending
Review via email: mp+15242@code.launchpad.net
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
=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc 2009-11-24 08:57:34 +0000
+++ src/ha_pbxt.cc 2009-11-25 13:45:26 +0000
@@ -5406,8 +5406,11 @@
54065406
5407 if (!(self = ha_set_current_thread(thd, &err)))5407 if (!(self = ha_set_current_thread(thd, &err)))
5408 return xt_ha_pbxt_to_mysql_error(err);5408 return xt_ha_pbxt_to_mysql_error(err);
54095409#ifdef DRIZZLED
5410 XT_PRINT2(self, "create (%s) %s\n", table_path, (create_info.options & HA_LEX_CREATE_TMP_TABLE) ? "temporary" : "");
5411#else
5410 XT_PRINT2(self, "create (%s) %s\n", table_path, (create_info->options & HA_LEX_CREATE_TMP_TABLE) ? "temporary" : "");5412 XT_PRINT2(self, "create (%s) %s\n", table_path, (create_info->options & HA_LEX_CREATE_TMP_TABLE) ? "temporary" : "");
5413#endif
54115414
5412 STAT_TRACE(self, *thd_query(thd));5415 STAT_TRACE(self, *thd_query(thd));
54135416

Subscribers

People subscribed via source and target branches