com php-src: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6: ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqli/ mysqli_api.c
ext/mysqli/mysqli_nonapi.c ext/mysqli/ tests/mysqli_begin_transaction.phpt ext/mysqlnd/mysqlnd .c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/ph
p_mysqlnd.c
| From: | Andrey Hristov | Date: | Thu, 10 Apr 2014 13:49:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6: ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqli/ mysqli_api.c ext/mysqli/mysqli_nonapi.c ext/mysqli/ tests/mysqli_begin_transaction.phpt ext/mysqlnd/mysqlnd .c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/ph p_mysqlnd.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76779@lists.php.net to get a copy of this message | ||
Commit: 090c3e87c0449e6eadf83815bb57c8a6eff4b56e
Author: Andrey Hristov <andrey@php.net> Thu, 10 Apr 2014 16:49:13 +0300
Parents: 63791d055ad64762c3f63e08ca7ad8ba1f44e0ab 3204ad5858a5abc50b11b8527d22c82eb07a80cc
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=090c3e87c0449e6eadf83815bb57c8a6eff4b56e
Log:
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
Changed paths:
MM ext/mysql/php_mysql.c
MM ext/mysqli/mysqli.c
MM ext/mysqli/mysqli_api.c
MM ext/mysqli/mysqli_nonapi.c
MM ext/mysqli/tests/mysqli_begin_transaction.phpt
MM ext/mysqlnd/mysqlnd.c
MM ext/mysqlnd/mysqlnd_reverse_api.c
MM ext/mysqlnd/php_mysqlnd.c
Diff:
diff --cc ext/mysqli/tests/mysqli_begin_transaction.phpt
index 7e70831,6c05081..c92e718
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@@ -131,10 -120,7 +120,16 @@@ if (!have_innodb($link)
?>
--EXPECTF--
NULL
++<<<<<<< HEAD
+[017] [1792] %s
+[018] invalid_flag = %d [%d]%A
Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d
[019] [%d]%A
+[020] [%d]%A
++=======
++
++Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d
++[019] [%d]%A
++>>>>>>> 3204ad5858a5abc50b11b8527d22c82eb07a80cc
done!