clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,283 Commits 491 Branches 1,363 Tags 838 MiB
a047ece2e0
Commit Graph

880 Commits

Author SHA1 Message Date
Andrey Hristov
a047ece2e0 Disable a flag 2013-07-22 11:02:48 +02:00
Andrey Hristov
e78ca0b634 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-08 20:26:38 +02:00
Andrey Hristov
3dd5f4ae4c Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7 Fixed segfault in mysqlnd when doing long prepare 2013-07-08 20:23:32 +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
Andrey Hristov
378a5f9bfe updates 2013-05-21 13:27:45 +02: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
Xinchen Hui
1c07590ed7 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:41:51 +08:00
Xinchen Hui
d54432ed98 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:38:10 +08:00
Xinchen Hui
c7b8368ed5 Fix memory realted to #64726 2013-04-27 23:38:00 +08:00
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