Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

phpmyadmin · Sep 3, 2015 · 0123628 · 0123628
2 parents 99c0ace + ae92e02
commit 0123628
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
@@ -118,7 +118,7 @@
     array(
         'query' => 'SELECT @@collation_server',
         'result' => array(
-            array('collation_server', 'utf8_general_ci'),
+            array('utf8_general_ci'),
         )
     ),
     array(
@@ -425,9 +425,9 @@
     ),
     array(
         'query' => 'SELECT @@collation_database',
-        'columns' => array('variable_name', 'variable_value'),
+        'columns' => array('@@collation_database'),
         'result' => array(
-            array('foo', 'bar'),
+            array('bar'),
         )
     ),
     array(
@@ -611,7 +611,7 @@
     ),
     array(
         'query' => 'SELECT @@default_authentication_plugin',
-        'result' => array(array('Variable_name' => 'mysql_native_password'))
+        'result' => array(array('@@default_authentication_plugin' => 'mysql_native_password'))
     ),
     array(
         'query' => "SELECT TABLE_NAME FROM information_schema.VIEWS WHERE "