Commit Graph

856 Commits

Author SHA1 Message Date
Andrey Hristov
666a835660 Add savepoint and rollback to savepoint support 2013-02-08 16:36:17 +01:00
Andrey Hristov
403d4fbbff Export new calls 2013-02-07 18:29:19 +01:00
Andrey Hristov
49e3d91ad9 Add the name in a comment at commit/rollback, if provided 2013-02-07 16:24:08 +01:00
Andrey Hristov
9fb0dba4be Add support for commit and rollback options.
Add support for explicitly starting a transaction - modes also available.
Using the API makes the life of load balancer mysqlnd plugins easier/possible.
2013-02-07 16:05:27 +01:00
Andrey Hristov
c311884e5b Merge branch 'PHP-5.4' into PHP-5.5 2013-02-04 14:28:23 +01:00
Andrey Hristov
740b823be8 check the validity of the parameter 2013-02-04 14:27:56 +01:00
Andrey Hristov
642cff08c1 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-01 17:22:21 +01:00
Andrey Hristov
f45a85c386 add new charset, from MySQL 5.6 2013-02-01 17:21:50 +01:00
Andrey Hristov
95346c017c fix valgrind warning 2013-01-22 16:48:39 +01:00
Andrey Hristov
acc24d1f9e Use two dtors thus allow allocation based on the alloc model of the
connection.
2013-01-15 12:19:52 +01:00
Andrey Hristov
d377a266b2 plug a leak - forgot ot use the dtor already written 2013-01-15 11:32:44 +01:00
Andrey Hristov
1ff4352263 Add support for connect attributes, as of MySQL 5.6 2013-01-15 10:04:59 +01:00
Andrey Hristov
258c76eb41 backport handling of expired passwords in mysqlnd to 5.4 2013-01-09 18:58:29 +01:00
Andrey Hristov
1f7f8429af Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/mysqlnd/mysqlnd.c
2013-01-09 18:40:57 +01:00
Andrey Hristov
bcd278ad7f fix compilation error after merge 2013-01-09 18:39:59 +01:00
Andrey Hristov
cb6071ef54 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/mysqlnd/mysqlnd.c
2013-01-09 18:30:56 +01:00
Andrey Hristov
6a6ec195ac Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea Use during connect the flags set with set_client_option() 2013-01-09 18:27:06 +01:00
Andrey Hristov
ddcb67d446 support for password expiration in mysqlnd, through a flag 2013-01-09 15:33:07 +01:00
Andrey Hristov
b8a369f522 Add new constants 2013-01-09 14:50:43 +01:00
Andrey Hristov
cde53e7fcd fix different values of mysqli_stmt_affected_rows between libmysql
and mysqlnd (in favor of libmysql) before execute and after prepare()
2013-01-07 16:36:21 +01:00
Xinchen Hui
cbb5d42b9b Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 10:23:21 +08:00
Xinchen Hui
a426e0b050 bump year 2013-01-06 10:22:15 +08:00
Xinchen Hui
c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00
Andrey Hristov
ec012c1b75 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
2012-12-19 16:58:34 +01:00
Andrey Hristov
1f7c46b579 be cautious about the result of strrchr 2012-12-18 16:21:05 +01:00
Anatoliy Belsky
bef54e5365 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:05:35 +01:00
Anatoliy Belsky
0d458ae89f Fixed mysqlnd compilation in debug mode on windows 2012-12-13 15:01:01 +01:00
Andrey Hristov
9acc2367b1 Merge branch 'PHP-5.4' 2012-10-31 19:04:10 +01:00
Andrey Hristov
965bd32fec Merge branch 'PHP-5.3' into PHP-5.4 2012-10-31 18:29:31 +01:00
Andrey Hristov
a17559d422 read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem 2012-10-31 18:26:09 +01:00
Andrey Hristov
a0a34f5bca plug recent leak 2012-10-31 16:13:00 +01:00
Andrey Hristov
d62bc53a4f cosmetics 2012-10-31 15:54:45 +01:00
Andrey Hristov
27e0999843 fix crashes in newly introduced macros when normal trace is disabled but
memory traced is enabled.
2012-10-22 14:35:35 +02:00
Andrey Hristov
b0e8fb6489 fix newly introduced segfault 2012-10-16 15:06:02 +02:00
Andrey Hristov
225792c5db constify 2012-10-12 10:20:09 +02:00
Andrey Hristov
4c9e222f99 if ssl has been switched on transmit clear-text password 2012-10-03 14:02:33 +02:00
Andrey Hristov
c540fe2064 fix login failure with empty password. This is 5.5 specific - new code 2012-09-28 11:58:41 +02:00
andrey
da96aa848f compile out example plugin in a release build 2012-09-26 17:13:46 +02:00
andrey
263b37bee1 change public key setting to PERDIR and finish code that allows
to set the key file programatically per mysqli_options()
2012-09-25 18:26:02 +02:00
andrey
6074df91c6 remove old unicode code, that is was compiled out by using a macro 2012-09-25 16:36:21 +02:00
andrey
571b46bff6 Add SHA256 authentication support - password hashing to mysqlnd
Automatic switchover to SSL with plain-text password is not part of this
2012-09-25 14:04:36 +02:00
andrey
815874c646 plug a leak when the server ask the client for a auth protocol, that
the client doesn't understand. This is 5.5 specific bug, as a result
of a refactoring in 5.5
2012-08-22 20:04:42 +02:00
andrey
79c6c93e0d Fix crashes with filenames that don't contain directory separator - generated
files like scanners/parsers.
2012-07-30 21:50:13 +03:00
Xinchen Hui
f13288de96 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
2012-07-18 19:06:58 +08:00
Xinchen Hui
25be12a3bc Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode) 2012-07-18 19:06:27 +08:00
Anatoliy Belsky
6071bfb325 fix windows build
- there should be no trailing white spaces after \ in multiline macros
2012-07-11 13:32:19 +02:00
andrey
049abdfb26 fix valgrind warning 2012-07-09 18:13:35 +03:00
andrey
66e1ac23c1 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2012-07-09 17:59:42 +03:00