diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-12-12 16:17:50 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-12-12 16:17:50 +0000 |
| commit | b529d43c0d24e512b23d3c780dbc96668a8fe380 (patch) | |
| tree | a24d644f660aeded1c5f614648456becac1de1ef /ext/mysqli | |
| parent | 79aaaf417960e685b55c18cfdf30f078cff03dea (diff) | |
| download | php-git-b529d43c0d24e512b23d3c780dbc96668a8fe380.tar.gz | |
Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA query)
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/tests/bug53503.phpt | 50 |
2 files changed, 51 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 72b242a662..8a570842e1 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -538,7 +538,7 @@ PHP_FUNCTION(mysqli_query) result = mysql_use_result(mysql->mysql); break; } - if (!result) { + if (!result && mysql_errno(mysql->mysql)) { php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC, "%s", mysql_error(mysql->mysql)); RETURN_FALSE; diff --git a/ext/mysqli/tests/bug53503.phpt b/ext/mysqli/tests/bug53503.phpt new file mode 100644 index 0000000000..1a2b7ed71a --- /dev/null +++ b/ext/mysqli/tests/bug53503.phpt @@ -0,0 +1,50 @@ +--TEST--
+Bug #53503 (mysqli::query returns false after successful LOAD DATA query)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+ require_once("connect.inc");
+
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+ printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!$link->query("DROP TABLE IF EXISTS tlocaldata")) {
+ printf("[002] [%d] %s\n", $link->errno, $link->error);
+ }
+
+ if (!$link->query("CREATE TABLE tlocaldata (dump1 INT UNSIGNED NOT NULL PRIMARY KEY) ENGINE=" . $engine)) {
+ printf("[003] [%d] %s\n", $link->errno, $link->error);
+ }
+
+ file_put_contents('bug53503.data', 'jokijoki');
+
+ if (!$link->query("LOAD DATA LOCAL INFILE 'bug53503.data' REPLACE INTO TABLE tlocaldata (dump1)")) {
+ echo "bug";
+ } else {
+ echo "done";
+ }
+?>
+--CLEAN--
+<?php
+require_once('connect.inc');
+
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+ printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+ $host, $user, $db, $port, $socket);
+}
+
+if (!mysqli_query($link, 'DROP TABLE IF EXISTS tlocaldata')) {
+ printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+}
+
+mysqli_close($link);
+
+unlink('bug53503.data');
+?>
+--EXPECT--
+done
\ No newline at end of file |