summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Wendel <uw@php.net>2011-08-12 11:51:44 +0000
committerUlf Wendel <uw@php.net>2011-08-12 11:51:44 +0000
commit94b7b548c5139f7f2325c300dfb1038feede7bc1 (patch)
treefe3dcbe22c3c69316c24044764b691b2424dd6cf
parentcaca6934031b7d76311117eb144b7ff6bc3cc921 (diff)
downloadphp-git-94b7b548c5139f7f2325c300dfb1038feede7bc1.tar.gz
MySQL 5.6 fractional seconds and PS
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_param.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_result.phpt3
2 files changed, 5 insertions, 0 deletions
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
index 71045789bc..d2d825438e 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
@@ -304,6 +304,8 @@ require_once('skipifconnectfailure.inc');
func_mysqli_stmt_bind_datatype($link, $engine, "s", "SET('a', 'b')", "a", 870);
func_mysqli_stmt_bind_datatype($link, $engine, "s", "SET('a', 'b')", NULL, 880);
+ if (mysqli_get_server_version($link) >= 50600)
+ func_mysqli_stmt_bind_datatype($link, $engine, "s", "TIME", "13:27:34.123456", 890, "13:27:34");
$stmt = mysqli_stmt_init($link);
if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)"))
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
index 26b39d516f..553e71ab6b 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
@@ -294,6 +294,9 @@ require_once('skipifconnectfailure.inc');
func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", "a", 1740, $hint_str_or_unicode);
func_mysqli_stmt_bind_result($link, $engine, "s", "SET('a', 'b')", NULL, 1760, $hint_str_or_unicode);
+ if (mysqli_get_server_version($link) >= 50600)
+ func_mysqli_stmt_bind_result($link, $engine, "s", "TIME", "13:31:34.123456", 1770, "13:31:34");
+
/* Check that the function alias exists. It's a deprecated function,
but we have not announce the removal so far, therefore we need to check for it */
if (!is_null($tmp = @mysqli_stmt_bind_result()))