gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2014-08-14 18:05:54 +02:00
commit eba4639029
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/plugins/export/ExportSql.class.php
View File

@ -1043,7 +1043,7 @@ class ExportSql extends ExportPlugin
// with $GLOBALS['dbi']->numRows() in mysqli
$result = $GLOBALS['dbi']->query(
'SHOW TABLE STATUS FROM ' . PMA_Util::backquote($db)
. ' LIKE \'' . PMA_Util::sqlAddSlashes($table, true) . '\'',
. ' WHERE Name = \'' . PMA_Util::sqlAddSlashes($table) . '\'',
null,
PMA_DatabaseInterface::QUERY_STORE
);

6
test/classes/plugin/export/PMA_ExportSql_test.php
View File

@ -1178,7 +1178,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
$dbi->expects($this->at(0))
->method('query')
->with(
'SHOW TABLE STATUS FROM `db` LIKE \'table\'', null,
'SHOW TABLE STATUS FROM `db` WHERE Name = \'table\'', null,
PMA_DatabaseInterface::QUERY_STORE
)
->will($this->returnValue('res'));
@ -1358,7 +1358,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
$dbi->expects($this->at(0))
->method('query')
->with(
'SHOW TABLE STATUS FROM `db` LIKE \'table\'', null,
'SHOW TABLE STATUS FROM `db` WHERE Name = \'table\'', null,
PMA_DatabaseInterface::QUERY_STORE
)
->will($this->returnValue('res'));
@ -1483,7 +1483,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
$dbi->expects($this->at(0))
->method('query')
->with(
'SHOW TABLE STATUS FROM `db` LIKE \'table\'', null,
'SHOW TABLE STATUS FROM `db` WHERE Name = \'table\'', null,
PMA_DatabaseInterface::QUERY_STORE
)
->will($this->returnValue('res'));