uw Fri Dec 28 18:19:18 2007 UTC
Modified files:
/php-src/ext/mysqli/tests 003.phpt 020.phpt
Log:
Merge from 5_3 - MySQL 6.0 SQL fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqli/tests/003.phpt
diff -u php-src/ext/mysqli/tests/003.phpt:1.9
php-src/ext/mysqli/tests/003.phpt:1.10
--- php-src/ext/mysqli/tests/003.phpt:1.9 Thu Aug 9 08:41:11 2007
+++ php-src/ext/mysqli/tests/003.phpt Fri Dec 28 18:19:17 2007
@@ -1,42 +1,64 @@
--TEST--
mysqli connect
--SKIPIF--
-<?php
-require_once('skipif.inc');
+<?php
+require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
-
- /*** test mysqli_connect 127.0.0.1 ***/
+
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
mysqli_query($link, "SET sql_mode=''");
-
+
if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"))
printf("[001] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- $rc = mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2
time,
-
c3 timestamp(14),
-
c4 year,
-
c5 datetime,
-
c6 timestamp(4),
-
c7 timestamp(6)) ENGINE=" . $engine);
+ $rc = @mysqli_query($link,"CREATE TABLE test_bind_result(
+ c1 date,
+ c2 time,
+ c3 timestamp(14),
+ c4 year,
+ c5 datetime,
+ c6 timestamp(4),
+ c7 timestamp(6)) ENGINE=" . $engine);
+
+ /*
+ Seems that not all MySQL 6.0 installations use defaults that ignore the
display widths.
+ From the manual:
+ From MySQL 4.1.0 on, TIMESTAMP display format differs from that of
earlier MySQL releases:
+ [...]
+ Display widths (used as described in the preceding section) are no
longer supported.
+ In other words, for declarations such as TIMESTAMP(2), TIMESTAMP(4),
and so on,
+ the display width is ignored.
+ [...]
+ */
+ if (!$rc)
+ $rc = @mysqli_query($link,"CREATE TABLE test_bind_result(
+ c1 date,
+ c2 time,
+ c3 timestamp,
+ c4 year,
+ c5 datetime,
+ c6 timestamp,
+ c7 timestamp) ENGINE=" . $engine);
if (!$rc)
printf("[002] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- $rc = mysqli_query($link, "INSERT INTO test_bind_result
VALUES('2002-01-02',
-
'12:49:00',
-
'2002-01-02 17:46:59',
-
2010,
-
'2010-07-10',
-
'2020','1999-12-29')");
+ $rc = mysqli_query($link, "INSERT INTO test_bind_result VALUES(
+ '2002-01-02',
+ '12:49:00',
+ '2002-01-02 17:46:59',
+ 2010,
+ '2010-07-10',
+ '2020','1999-12-29')");
if (!$rc)
printf("[003] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
- $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result");
+ $stmt = mysqli_prepare($link, "SELECT c1, c2, c3, c4, c5, c6, c7 FROM
test_bind_result");
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
mysqli_execute($stmt);
mysqli_fetch($stmt);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/020.phpt?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/mysqli/tests/020.phpt
diff -u php-src/ext/mysqli/tests/020.phpt:1.11
php-src/ext/mysqli/tests/020.phpt:1.12
--- php-src/ext/mysqli/tests/020.phpt:1.11 Thu Aug 9 08:41:12 2007
+++ php-src/ext/mysqli/tests/020.phpt Fri Dec 28 18:19:17 2007
@@ -1,8 +1,8 @@
--TEST--
mysqli bind_param/bind_result date
--SKIPIF--
-<?php
-require_once('skipif.inc');
+<?php
+require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@@ -20,13 +20,26 @@
mysqli_query($link, "SET sql_mode=''");
mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result");
- mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2 time,
+
+ $rc = @mysqli_query($link,"CREATE TABLE test_bind_result(
+ c1 date,
+ c2 time,
c3 timestamp(14),
c4 year,
c5 datetime,
c6 timestamp(4),
c7 timestamp(6))");
+ if (!$rc)
+ $rc = mysqli_query($link,"CREATE TABLE test_bind_result(
+ c1 date,
+ c2 time,
+ c3 timestamp,
+ c4 year,
+ c5 datetime,
+ c6 timestamp,
+ c7 timestamp)");
+
$stmt = mysqli_prepare($link, "INSERT INTO test_bind_result VALUES
(?,?,?,?,?,?,?)");
mysqli_bind_param($stmt, "sssssss", $d1, $d2, $d3, $d4, $d5, $d6, $d7);
@@ -41,7 +54,7 @@
mysqli_execute($stmt);
mysqli_stmt_close($stmt);
- $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result");
+ $stmt = mysqli_prepare($link, "SELECT c1, c2, c3, c4, c5, c6, c7 FROM
test_bind_result");
mysqli_bind_result($stmt,$c1, $c2, $c3, $c4, $c5, $c6, $c7);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
