com php-src: Fix the fix: ext/mysqli/tests/mysqli_begin_tra nsaction.phpt
| From: | Andrey Hristov | Date: | Thu, 10 Apr 2014 15:13:44 +0000 |
| Subject: | com php-src: Fix the fix: ext/mysqli/tests/mysqli_begin_tra nsaction.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76775@lists.php.net to get a copy of this message | ||
Commit: af5fa00c97530e3b92427ae9a8c5ef89f84ff3c3
Author: Andrey Hristov <andrey@php.net> Thu, 10 Apr 2014 18:13:44 +0300
Parents: 090c3e87c0449e6eadf83815bb57c8a6eff4b56e
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af5fa00c97530e3b92427ae9a8c5ef89f84ff3c3
Log:
Fix the fix
Changed paths:
M ext/mysqli/tests/mysqli_begin_transaction.phpt
Diff:
diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt
b/ext/mysqli/tests/mysqli_begin_transaction.phpt
index c92e718..6c05081 100644
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@ -120,16 +120,7 @@ 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!
\ No newline at end of file