Drizzle

Merge lp:~linuxjedi/drizzle/trunk-bug-683917 into lp:drizzle/7.0

  1. trunk-bug-683917
  2. Merge into 7.0
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 1967
Merged at revision: 1970
Proposed branch: lp:~linuxjedi/drizzle/trunk-bug-683917
Merge into: lp:drizzle/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
client/drizzledump_mysql.cc (+1/-1)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/trunk-bug-683917
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+42469@code.launchpad.net

Description of the change

When migrating from MySQL memory tables cannot be used in Drizzle for non-temporary tables, so convert to InnoDB.

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 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc 2010-11-02 10:28:05 +0000
+++ client/drizzledump_mysql.cc 2010-12-02 12:53:50 +0000
@@ -498,7 +498,7 @@
498498
499void DrizzleDumpTableMySQL::setEngine(const char* newEngine)499void DrizzleDumpTableMySQL::setEngine(const char* newEngine)
500{500{
501 if (strcmp(newEngine, "MyISAM") == 0)501 if ((strcmp(newEngine, "MyISAM") == 0) || (strcmp(newEngine, "MEMORY") == 0))
502 engineName= "InnoDB";502 engineName= "InnoDB";
503 else503 else
504 engineName= newEngine; 504 engineName= newEngine;

Subscribers

People subscribed via source and target branches