diff --git a/bin/pt-archiver b/bin/pt-archiver
index f17a8dd0..42a2c60e 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -1564,13 +1564,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index f3acba29..9432a4f1 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -206,13 +206,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-find b/bin/pt-find
index 5cef423c..516c34d0 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -1603,13 +1603,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index a55b4680..2f2152c4 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -2529,13 +2529,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 4a775959..91038e65 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -2801,13 +2801,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-kill b/bin/pt-kill
index 5c77c08a..ba2e2e35 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -2479,13 +2479,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor
index d5927de4..fda4cfd5 100755
--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -5291,13 +5291,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 29d2a737..950b2622 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -38,6 +38,7 @@ BEGIN {
       MemcachedEvent
       BinaryLogParser
       GeneralLogParser
+      RawLogParser
       ProtocolParser
       HTTPProtocolParser
       ExecutionThrottler
@@ -8119,13 +8120,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index c783e2bb..8bcf003a 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -3705,13 +3705,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 60db946d..4c025c0f 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -2383,13 +2383,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-table-usage b/bin/pt-table-usage
index af5d1fde..3700a786 100755
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -5640,13 +5640,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 2aaacf26..a9ad5241 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -478,13 +478,14 @@ sub get_create_table {
    my $q = $self->{Quoter};
 
    my $new_sql_mode
-      = '/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, '
-      . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
-      . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
-      . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
+      = q{/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, }
+      . q{@@SQL_MODE := '', }
+      . q{@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := 1 */};
 
-   my $old_sql_mode = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
-                     . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
+   my $old_sql_mode
+      = q{/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, }
+      . q{@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */};
 
    PTDEBUG && _d($new_sql_mode);
    eval { $dbh->do($new_sql_mode); };