diff options
author | Andrey Hristov <andrey@php.net> | 2014-06-18 16:42:42 +0300 |
---|---|---|
committer | Andrey Hristov <andrey@php.net> | 2014-06-18 16:42:42 +0300 |
commit | 23f77050eb1a3042276eece560ae03ef5b3cb3a6 (patch) | |
tree | 6048f040e748f0417ebf67dd8d825ec4d825de7a | |
parent | b0b47a20645994783eeb5662efaede5dcc4aa4e0 (diff) | |
parent | 21c9a9388fc3c3b88a48a7e25c932e1e2c008b81 (diff) | |
download | php-git-23f77050eb1a3042276eece560ae03ef5b3cb3a6.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
-rw-r--r-- | ext/mysqli/tests/table.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/tests/table.inc b/ext/mysqli/tests/table.inc index aa1207af44..cb089bb950 100644 --- a/ext/mysqli/tests/table.inc +++ b/ext/mysqli/tests/table.inc @@ -12,7 +12,7 @@ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { exit(1); } -if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) { +if (!mysqli_query($link, 'CREATE TABLE test(id INT DEFAULT 0, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) { printf("Failed to create test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); exit(1); } |