Andrey Hristov
7b7424c34c
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-19 16:29:53 +02:00
Andrey Hristov
39cc08c7e9
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-19 15:55:46 +02:00
Andrey Hristov
0802961bd1
lower the limit, should fit in a byte
2013-04-19 15:54:35 +02:00
Nikita Popov
585f71f497
Fix some errors in mysqlnd charset list
...
I fixed the stuff that seemed obviously wrong, but there are some more
differences with the SHOW COLLATIONS output:
* The whole range of "utf16" collations missing
* "filename" missing
* "ucs2_general_mysql500_ci" and "utf8_general_mysql500_ci" missing
I wasn't sure whether those omissions are intentional, so I didn't add
them.
2013-03-24 16:09:39 +01:00
Andrey Hristov
c09652c289
fix the fix
2013-03-13 15:56:44 +01:00
Andrey Hristov
7503a4b4a4
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-03-13 15:29:40 +01:00
Andrey Hristov
0777a18703
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2013-03-13 14:24:23 +01:00
Andrey Hristov
f1e2edff8b
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
2013-03-13 13:37:51 +01:00
Johannes Schlüter
b479c2bffb
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 16:50:59 +01:00
Johannes Schlüter
064c62e4cf
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
2013-02-21 16:49:28 +01:00
Andrey Hristov
5bfdf4f069
build fixes
2013-02-11 12:07:10 +01: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
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
