Andrey Hristov
01c2ec03bc
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
configure.in
ext/mysqli/mysqli_api.c
main/php_version.h
2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee
Fix problem with mysqli_commt()/mysqli_rollback()
2014-03-19 18:32:19 +02:00
Andrey Hristov
990f9c8f3f
Switch from a single flag to a flag byte
2014-03-10 17:25:53 +02:00
Andrey Hristov
6b804b96b8
Refactor the result set data structures. Move more to the buffered and unbuffered
...
substructures. Add methods to these too. Preparing for pluggable interface for
returning data to the engine (zvals, c-style, something else)
2014-03-05 16:22:23 +02:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Andrey Hristov
ceb1b7e20f
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979
Fix loss of precision
2013-12-04 12:06:59 +02:00
Andrey Hristov
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
Andrey Hristov
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
Xinchen Hui
d4f5ca467f
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
2013-11-05 11:08:09 +08:00
Lior Kaplan
d3fd163d27
Typo fix: umknown -> unknown
2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f
Typo fix: umknown -> unknown
2013-10-31 22:59:42 +02:00
Andrey Hristov
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
Kalle Sommer Nielsen
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
Johannes Schlüter
9aa7343ae0
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9
Make sure return value is initialised in case transaction startup fails
2013-07-03 17:08:14 +02:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Johannes Schlüter
062519ed41
don't include smart_str.h in a too global header, fixes #64718
2013-04-30 14:26:55 +02:00
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
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
Xinchen Hui
cbb5d42b9b
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-06 10:23:21 +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
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
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
049abdfb26
fix valgrind warning
2012-07-09 18:13:35 +03:00
andrey
555db7dc4e
fix valgrind warning
2012-07-09 17:59:23 +03:00