Drizzle

Merge lp:~linuxjedi/drizzle/elliott-bug-652990 into lp:drizzle/7.0

  1. elliott-bug-652990
  2. Merge into 7.0
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 1803
Merge reported by: Lee Bieber
Merged at revision: not available
Proposed branch: lp:~linuxjedi/drizzle/elliott-bug-652990
Merge into: lp:drizzle/7.0
Diff against target: 11 lines (+1/-1)
1 file modified
client/drizzledump_mysql.cc (+1/-1)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/elliott-bug-652990
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+37285@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

Views were causing segfault when converting (they shouldn't have been read at all)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/drizzledump_mysql.cc'
2--- client/drizzledump_mysql.cc 2010-09-24 13:38:21 +0000
3+++ client/drizzledump_mysql.cc 2010-10-01 16:42:48 +0000
4@@ -40,7 +40,7 @@
5 if (verbose)
6 std::cerr << _("-- Retrieving table structures for ") << databaseName << "..." << std::endl;
7
8- query="SELECT TABLE_NAME, TABLE_COLLATION, ENGINE, AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='";
9+ query="SELECT TABLE_NAME, TABLE_COLLATION, ENGINE, AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE != 'VIEW' AND TABLE_SCHEMA='";
10 query.append(databaseName);
11 query.append("' ORDER BY TABLE_NAME");
12

Subscribers

People subscribed via source and target branches