MDL-17377 DML: prefixless database regression in new native drivers

diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index 1da8284874d3de1333993d662b5f6a3ecc2e3870..b32f45db38548344a4c6c40bc7c3ddc81a7e5b3b 100644 (file)
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -156,10 +156,12 @@ class mysqli_native_moodle_database extends moodle_database {
         if ($result) {
             while ($arr = $result->fetch_assoc()) {
                 $tablename = reset($arr);
-                if (strpos($tablename, $this->prefix) !== 0) {
-                    continue;
+                if ($this->prefix !== '') {
+                    if (strpos($tablename, $this->prefix) !== 0) {
+                        continue;
+                    }
+                    $tablename = substr($tablename, strlen($this->prefix));
                 }
-                $tablename = substr($tablename, strlen($this->prefix));
                 $tables[$tablename] = $tablename;
             }
             $result->close();
@@ -172,7 +174,6 @@ class mysqli_native_moodle_database extends moodle_database {
      * @return array of arrays
      */
     public function get_indexes($table) {
-        $preflen = strlen($this->prefix);
         $indexes = array();
         $sql = "SHOW INDEXES FROM {$this->prefix}$table";
         $this->query_start($sql, null, SQL_QUERY_AUX);