[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-37-g468d08f

Dieter Adriaenssens ruleant at users.sourceforge.net
Wed Nov 24 17:00:11 CET 2010


The branch, master has been updated
       via  468d08f97543fd4554d28812be937fd2b4a9a847 (commit)
       via  4e6a1bb0a9e0a8c484f4ff1362b0ca2e4beb5ff5 (commit)
       via  d1a6f043e28761a619a0c02f7746c288b3d78400 (commit)
       via  d6a7bd40faa240c23016ce482c36650294faa13e (commit)
      from  fb58213d4be3b68ee143719661309bb6598a4fb0 (commit)


- Log -----------------------------------------------------------------
commit 468d08f97543fd4554d28812be937fd2b4a9a847
Merge: fb58213d4be3b68ee143719661309bb6598a4fb0 4e6a1bb0a9e0a8c484f4ff1362b0ca2e4beb5ff5
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Wed Nov 24 16:59:12 2010 +0100

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    2 ++
 server_replication.php |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f79ed3e..19b3110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -129,6 +129,8 @@
 - bug #3103853 [js] Double quotes were not escaped in generated js
 - bug #3077463 [core] Events were not copied when copying/renaming database
 - bug #1762306 [core] Copy database with view of a view
+- patch #3117535 [replication] Add quotes to database in initial statement,
+  thanks to Craig Duncan - duncan3dc
 
 3.3.8.0 (2010-10-25)
 - bug #3059311 [import] BIGINT field type added to table analysis
diff --git a/server_replication.php b/server_replication.php
index 6c410fa..17ac37a 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -122,11 +122,11 @@ if (isset($GLOBALS['sr_take_action'])) {
                 }
                 $dblist[] = $tmp_row[0];
 
-                PMA_DBI_query('CREATE DATABASE IF NOT EXISTS '.$tmp_row[0], $trg_link);
+                PMA_DBI_query('CREATE DATABASE IF NOT EXISTS '.PMA_backquote($tmp_row[0]), $trg_link);
             } else {
                 if (array_search($tmp_row[0], $do_db) !== false) {
                     $dblist[] = $tmp_row[0];
-                    PMA_DBI_query('CREATE DATABASE IF NOT EXISTS '.$tmp_row[0], $trg_link);
+                    PMA_DBI_query('CREATE DATABASE IF NOT EXISTS '.PMA_backquote($tmp_row[0]), $trg_link);
                 }
             }
         } // end while


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list