David Soria Parra
6e7284fb5b
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01:00
Johannes Schlüter
4c4a33e706
Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled
...
# 5.3 not affected
2012-03-05 23:55:12 +00:00
Johannes Schlüter
5cea216900
Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled
...
# 5.3 not affected
2012-03-05 23:55:12 +00:00
Stanislav Malyshev
f43330a371
remove -dev for release
2012-02-28 18:43:44 +00:00
Andrey Hristov
7153f7f887
assert
2012-02-02 15:00:42 +00:00
Andrey Hristov
da0da10bc9
assert
2012-02-02 15:00:42 +00:00
Andrey Hristov
d54bdbbbe4
assert
2012-02-02 15:00:42 +00:00
Christopher Jones
f115235a6e
Fix configuration message typo and alignment (5.4 merge approved by Stas)
2012-01-12 23:23:05 +00:00
Christopher Jones
6d75ac3df9
Fix configuration message typo and alignment (5.4 merge approved by Stas)
2012-01-12 23:23:05 +00:00
Christopher Jones
dd9ce389c2
Fix configuration message typo and alignment (5.4 merge approved by Stas)
2012-01-12 23:23:05 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Andrey Hristov
8b64eaf6c8
add some PHPAPI
2011-12-14 16:28:13 +00:00
Andrey Hristov
0905ff2fe5
Don't write more data than the protocol can grok or the server will
...
be confused. This comes without a test because the server needs to be
a non-community one with closed source PAM plugin loaded.
2011-11-30 17:20:25 +00:00
Andrey Hristov
b9bb138017
Don't write more data than the protocol can grok or the server will
...
be confused. This comes without a test because the server needs to be
a non-community one with closed source PAM plugin loaded.
2011-11-30 17:20:25 +00:00
Andrey Hristov
842b7d6840
use the method in all builds. Thus it can be used for detection
...
of state transitioning in every case
2011-11-22 16:38:06 +00:00
Andrey Hristov
692e7f2bd9
use the method in all builds. Thus it can be used for detection
...
of state transitioning in every case
2011-11-22 16:38:06 +00:00
Andrey Hristov
0e31a00117
use the method in all builds. Thus it can be used for detection
...
of state transitioning in every case
2011-11-22 16:38:06 +00:00
Andrey Hristov
de50e98a07
Add a middleman which can intercept the calls and can reroute them
2011-11-02 17:06:30 +00:00
Andrey Hristov
a330739594
Add a middleman which can intercept the calls and can reroute them
2011-11-02 17:06:30 +00:00
Andrey Hristov
2627fafcbd
- shift a bit of code around
...
- when cloning use the methods of the original object
2011-11-02 15:08:01 +00:00
Andrey Hristov
29f88a003f
- shift a bit of code around
...
- when cloning use the methods of the original object
2011-11-02 15:08:01 +00:00
Andrey Hristov
989f2fbc14
fix trace log messages
2011-11-02 14:20:35 +00:00
Andrey Hristov
4f7dc4d283
fix trace log messages
2011-11-02 14:20:35 +00:00
Andrey Hristov
ba1f65faa1
Now really split the method tables and have different
...
methods for the handle and the data object.
Add auxiliary functions to work with the new methods.
Add possibility to clone a connection object - shadow copy.
2011-10-31 14:33:56 +00:00
Andrey Hristov
92ec40d8e4
Now really split the method tables and have different
...
methods for the handle and the data object.
Add auxiliary functions to work with the new methods.
Add possibility to clone a connection object - shadow copy.
2011-10-31 14:33:56 +00:00
Andrey Hristov
6a9feb730f
Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA.
...
A step in the direction of keeping internal data private
2011-10-31 11:46:24 +00:00
Andrey Hristov
8fb6bdd5b8
Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA.
...
A step in the direction of keeping internal data private
2011-10-31 11:46:24 +00:00
Andrey Hristov
7edb8a69b6
Bump internal version id after recent changes
2011-10-26 09:00:32 +00:00
Andrey Hristov
cae81edb0c
Bump internal version id after recent changes
2011-10-26 09:00:32 +00:00
Andrey Hristov
f926a3c07d
Move from directly referencing an aggregated structure to using a
...
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov
845d8fa10c
Move from directly referencing an aggregated structure to using a
...
pointer to a structure. The structure is still aggregated but we add
a level of indirection for possible plugins to overwrite the storage
2011-10-25 23:01:49 +00:00
Andrey Hristov
3295415cce
Add hooks for __call like functionality and also allow to
...
handle calls that spread over two internal functions. Let's call it
a local TX.
2011-10-25 19:04:36 +00:00
Andrey Hristov
13bc754db7
Add hooks for __call like functionality and also allow to
...
handle calls that spread over two internal functions. Let's call it
a local TX.
2011-10-25 19:04:36 +00:00
Andrey Hristov
4cda1b4086
remove duplicate, happened after double patching
2011-10-24 12:54:04 +00:00
Andrey Hristov
4321da0388
move plugin specific stuff to one file. create object factory
...
for similar objects
2011-10-24 12:34:44 +00:00
Andrey Hristov
374018803a
move plugin specific stuff to one file. create object factory
...
for similar objects
2011-10-24 12:34:44 +00:00
Andrey Hristov
e111b23dd7
fix the build
2011-10-21 15:36:36 +00:00
Andrey Hristov
7472c081b7
add files that weren't committed with the previous commit
2011-10-21 15:29:43 +00:00
Andrey Hristov
652490d43a
shift code around to two new files - mysqlnd_driver.c
...
and mysqlnd_ext_plugin.c (mysqlnd extension plugin)
2011-10-21 15:28:58 +00:00
Andrey Hristov
139813877c
shift code around to two new files - mysqlnd_driver.c
...
and mysqlnd_ext_plugin.c (mysqlnd extension plugin)
2011-10-21 15:28:58 +00:00
Andrey Hristov
10e4419231
api_ext to reverse_api
2011-10-19 15:04:12 +00:00
Andrey Hristov
efb68d9399
api_ext to reverse_api
2011-10-19 15:04:12 +00:00
Rui Hirokawa
41ddca803d
fixed maximum byte length of utf8mb4.
2011-10-18 14:28:21 +00:00
Rui Hirokawa
e3c13d7961
fixed maximum byte length of utf8mb4.
2011-10-18 14:28:01 +00:00
Andrey Hristov
5117bf657e
move change_user closer to connect
2011-10-18 14:10:44 +00:00
Andrey Hristov
1619ebbec6
this should be decided by configure
2011-10-14 14:12:16 +00:00
Andrey Hristov
badb5f2610
export this existing function
2011-10-12 16:18:02 +00:00
Andrey Hristov
bbf59ae4da
export this existing function
2011-10-12 16:18:02 +00:00
Andrey Hristov
68ce999e18
MYSQLND_NET refactored not to use any direct reference to MYSQLND (the connection)
...
QC will need an ifdef-layer to compile with this
2011-10-10 20:49:28 +00:00
Andrey Hristov
a498bc62b8
MYSQLND_NET refactored not to use any direct reference to MYSQLND (the connection)
...
QC will need an ifdef-layer to compile with this
2011-10-10 20:49:28 +00:00
Andrey Hristov
b5f5770399
MYSQLND_NET refactored not to use any direct reference to MYSQLND (the connection)
...
QC will need an ifdef-layer to compile with this
2011-10-10 20:49:28 +00:00
Andrey Hristov
c3019a16d5
try not to crash when closing persistent sockets, because EG(persistent_list)
...
is cleaned before the extensions' MSHUTDOWNs are called.
2011-10-06 00:45:58 +00:00
Andrey Hristov
5f6020bc4d
try not to crash when closing persistent sockets, because EG(persistent_list)
...
is cleaned before the extensions' MSHUTDOWNs are called.
2011-10-06 00:45:58 +00:00
Johannes Schlüter
a7410ea03d
- Fix folding
2011-09-25 13:06:09 +00:00
Johannes Schlüter
31ff0d156e
- Fix folding
2011-09-25 13:06:09 +00:00
Johannes Schlüter
223e2ac106
- Fix folding
2011-09-25 13:06:09 +00:00
Xinchen Hui
579408b897
Fix warning "implicit declaration of function `zend_fetch_debug_backtrace'"
2011-09-25 03:18:39 +00:00
Xinchen Hui
437f058814
Fix warning "implicit declaration of function `zend_fetch_debug_backtrace'"
2011-09-25 03:18:39 +00:00
Pierre Joye
272180cb85
- fix build (macros mess)
2011-09-17 12:41:23 +00:00
Pierre Joye
6c2b670e69
- fix build (macros mess)
2011-09-17 12:41:23 +00:00
Pierre Joye
7b2eeea2b4
- fix TS build
2011-09-17 10:24:18 +00:00
Pierre Joye
a68abe830d
- fix TS build
2011-09-17 10:24:18 +00:00
Dmitry Stogov
938d956e2e
Fixed Windows build
2011-09-16 06:55:43 +00:00
Dmitry Stogov
d6ab6bc6ea
Fixed Windows build
2011-09-16 06:55:43 +00:00
Johannes Schlüter
9554e24547
- Fix bug #55609 (mysqlnd cannot be built shared)
...
# This adds an option --enable-mysqlnd to explicitly built mysqlnd, like any
# other extension it can be used with =shared to build mysqlnd shared;
# mysqlnd will implicitly enabled when requested from another extension
2011-09-06 16:38:22 +00:00
Johannes Schlüter
7420cf22bc
- Fix bug #55609 (mysqlnd cannot be built shared)
...
# This adds an option --enable-mysqlnd to explicitly built mysqlnd, like any
# other extension it can be used with =shared to build mysqlnd shared;
# mysqlnd will implicitly enabled when requested from another extension
2011-09-06 16:38:22 +00:00
Johannes Schlüter
fca3b40d7b
- Fix bug #55609 (mysqlnd cannot be built shared)
...
# This adds an option --enable-mysqlnd to explicitly built mysqlnd, like any
# other extension it can be used with =shared to build mysqlnd shared;
# mysqlnd will implicitly enabled when requested from another extension
2011-09-06 16:38:22 +00:00
Andrey Hristov
049a7c49cd
add query information to the trace log
2011-09-06 14:48:43 +00:00
Andrey Hristov
4f0b4031fe
add query information to the trace log
2011-09-06 14:48:43 +00:00
Andrey Hristov
3a510c616d
missing from previous commit for #55582
2011-09-05 15:37:58 +00:00
Andrey Hristov
4325a8bffc
Fix for Bug #55582 mysqli_num_rows() returns always 0 for unbuffered, when mysqlnd is used
2011-09-05 15:29:45 +00:00
Andrey Hristov
5308ed60f3
Fix for Bug #55582 mysqli_num_rows() returns always 0 for unbuffered, when mysqlnd is used
2011-09-05 15:29:45 +00:00
Xinchen Hui
83f61c2c53
Fixed compiler warning "incompatible pointer type"
2011-09-05 15:02:21 +00:00
Xinchen Hui
6a4153db0c
Fixed compiler warning "incompatible pointer type"
2011-09-05 15:02:21 +00:00
Gustavo André dos Santos Lopes
dbe8c7c4fa
- Fixed bad xor in signed types due to integer promotion.
...
- Replaced undefined signed overflow with char -> unsigned char conversion.
2011-09-05 00:39:39 +00:00
Gustavo André dos Santos Lopes
22479239a8
- Fixed bad xor in signed types due to integer promotion.
...
- Replaced undefined signed overflow with char -> unsigned char conversion.
2011-09-05 00:39:39 +00:00
Gustavo André dos Santos Lopes
187b419b04
- Fixed bad xor in signed types due to integer promotion.
...
- Replaced undefined signed overflow with char -> unsigned char conversion.
2011-09-05 00:39:39 +00:00
Andrey Hristov
3d890c29fd
fix message
2011-09-02 12:59:32 +00:00
Andrey Hristov
1f3e66cd56
fix message
2011-09-02 12:59:32 +00:00
Andrey Hristov
e35e394a79
fix message
2011-09-02 12:59:32 +00:00
Andrey Hristov
9f7ad10a63
function rename to comply with the schema of other callbacks
2011-09-02 11:22:41 +00:00
Andrey Hristov
2dbc61a2ff
function rename to comply with the schema of other callbacks
2011-09-02 11:22:41 +00:00
Andrey Hristov
d96e924b25
function rename to comply with the schema of other callbacks
2011-09-02 11:22:41 +00:00
Johannes Schlüter
f90bead78a
- Fix TSRM build
2011-09-01 12:04:54 +00:00
Johannes Schlüter
4eff96b99b
- Fix TSRM build
2011-09-01 12:04:54 +00:00
Johannes Schlüter
7d25510b1b
- Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd
2011-08-31 20:30:08 +00:00
Johannes Schlüter
39b0be5126
- Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd
2011-08-31 20:30:08 +00:00
Andrey Hristov
fa8a1c387a
Fix valgrind error (sending of initialized bytes over the network).
...
When the compression was successful the compressed data + uninitialized data
at the end was sent to the server, because the length of the compressed payload
wasn't correctly calculated (actually the length of the uncompressed payload as assumed).
However, the uncompress() function has internally the length of the real payload and skips
the binary trash at the end - thus no data damage occurs!
2011-08-31 18:18:23 +00:00
Andrey Hristov
12a4dcf5dc
Fix valgrind error (sending of initialized bytes over the network).
...
When the compression was successful the compressed data + uninitialized data
at the end was sent to the server, because the length of the compressed payload
wasn't correctly calculated (actually the length of the uncompressed payload as assumed).
However, the uncompress() function has internally the length of the real payload and skips
the binary trash at the end - thus no data damage occurs!
2011-08-31 18:18:23 +00:00
Andrey Hristov
604fa1537a
Fix valgrind error (sending of initialized bytes over the network).
...
When the compression was successful the compressed data + uninitialized data
at the end was sent to the server, because the length of the compressed payload
wasn't correctly calculated (actually the length of the uncompressed payload as assumed).
However, the uncompress() function has internally the length of the real payload and skips
the binary trash at the end - thus no data damage occurs!
2011-08-31 18:18:23 +00:00
Andrey Hristov
9756f766b6
fix valgrind warnings in debug builds
2011-08-26 12:14:31 +00:00
Andrey Hristov
da2839f71d
fix valgrind warnings in debug builds
2011-08-26 12:14:31 +00:00
Andrey Hristov
ee17839f20
fix valgrind warnings in debug builds
2011-08-26 12:14:31 +00:00
Xinchen Hui
d4a50542ea
Eliminated compile warning "comparison is always false due to limited range of data type"
...
Fixed test failed due to mysql_pconnect throw warning
Fixed test failed when host mysql server doesn't listen on 3306
2011-08-24 10:15:47 +00:00
Xinchen Hui
d7e0ccbc5a
Eliminated compile warning "comparison is always false due to limited range of data type"
...
Fixed test failed due to mysql_pconnect throw warning
Fixed test failed when host mysql server doesn't listen on 3306
2011-08-24 10:15:47 +00:00
Xinchen Hui
344136e8e9
Apply r315270 to 5.3
...
Fixed test script failed when host mysql doesn't listen on 3306
Fxied test script failed due to mysql_pconnect trigger a warning
2011-08-24 08:00:23 +00:00
Xinchen Hui
9fb62f3382
Sync r314808 to 5_3 branch
...
Eliminated compiler warnings "comparison is always false", "cast to pointer from integer of different siz" and tail zero warnings
2011-08-23 10:18:48 +00:00
Andrey Hristov
9baee85844
Fix Bug #55473 mysql_pconnect leaks file descriptors on reconnect
...
The fix is for now in 5_4 and trunk, to be merged into 5_3 after 5.3.8
is packaged (expected today). The test case goes to all branches
2011-08-22 10:42:43 +00:00
Andrey Hristov
0aa6354a2d
Fix Bug #55473 mysql_pconnect leaks file descriptors on reconnect
...
The fix is for now in 5_4 and trunk, to be merged into 5_3 after 5.3.8
is packaged (expected today). The test case goes to all branches
2011-08-22 10:42:43 +00:00
Andrey Hristov
9ae3777b10
compile out when PHP_DEBUG is not present
2011-08-17 11:15:55 +00:00
Andrey Hristov
34019766b6
compile out when PHP_DEBUG is not present
2011-08-17 11:15:55 +00:00
Andrey Hristov
56d6f23196
relax constraint
2011-08-10 14:12:24 +00:00
Andrey Hristov
e289cf7267
relax constraint
2011-08-10 14:12:24 +00:00
Andrey Hristov
d627115800
relax constraint
2011-08-10 14:12:24 +00:00
Felipe Pena
997f323e3a
- Added ZEND_MOD_END macro to use in the end of zend_module_dep[]
2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8
- Added ZEND_MOD_END macro to use in the end of zend_module_dep[]
2011-08-06 14:47:44 +00:00
Felipe Pena
9480eace41
- Added ZEND_MOD_END macro to use in the end of zend_module_dep[]
2011-08-06 14:47:44 +00:00
Andrey Hristov
c9e7716cfd
Add mysqli_error_list() that returns an array with errors. Typically only
...
one and just one for libmysql. mysqlnd can return generate more than one error
during its work and with mysqli_error() only the last error is being reported.
In the array returned by mysqli_error_list() / $mysqli->error_list, all errors will be found.
The list is reset when the next command is executed
2011-08-04 09:51:26 +00:00
Andrey Hristov
11f198b203
Add mysqli_error_list() that returns an array with errors. Typically only
...
one and just one for libmysql. mysqlnd can return generate more than one error
during its work and with mysqli_error() only the last error is being reported.
In the array returned by mysqli_error_list() / $mysqli->error_list, all errors will be found.
The list is reset when the next command is executed
2011-08-04 09:51:26 +00:00
Andrey Hristov
94ccf70c77
longer error messages, don't cut them
2011-07-27 10:26:59 +00:00
Andrey Hristov
2e1825830f
longer error messages, don't cut them
2011-07-27 10:26:59 +00:00
Andrey Hristov
11e4f1e39a
longer error messages, don't cut them
2011-07-27 10:26:59 +00:00
Felipe Pena
23e438594d
- Make usage of new PHP_FE_END macro
2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
Andrey Hristov
774e127a00
free data in case of failure in the callee not in the caller
2011-07-05 20:31:53 +00:00
Andrey Hristov
fa27e05438
free data in case of failure in the callee not in the caller
2011-07-05 20:31:53 +00:00
Andrey Hristov
e77b49bfd3
free data in case of failure in the callee not in the caller
2011-07-05 20:31:53 +00:00
Andrey Hristov
ce816cb883
reuse code
2011-05-31 20:42:44 +00:00
Andrey Hristov
b97e76d512
reuse code
2011-05-31 20:42:44 +00:00
Andrey Hristov
b730fde67f
reuse code
2011-05-31 20:42:44 +00:00
Andrey Hristov
e2ac61225f
fix macros
2011-05-31 10:35:07 +00:00
Andrey Hristov
33701b76ae
fix macros
2011-05-31 10:35:07 +00:00
Andrey Hristov
0de3cd84a5
fix macros
2011-05-31 10:35:07 +00:00
Andrey Hristov
a417820be3
exchange a "trap" with an error
2011-05-17 09:44:11 +00:00
Andrey Hristov
778273291d
exchange a "trap" with an error
2011-05-17 09:44:11 +00:00
Andrey Hristov
6c2f42b544
exchange a "trap" with an error
2011-05-17 09:44:11 +00:00
Johannes Schlüter
1eb7704974
- Move the field access behind the check
...
# Only called from one place where the connection is checked, but
# playing safe, again (parfait)
2011-05-17 00:16:57 +00:00
Johannes Schlüter
85eb08885b
- Move the field access behind the check
...
# Only called from one place where the connection is checked, but
# playing safe, again (parfait)
2011-05-17 00:16:57 +00:00
Johannes Schlüter
b83b4880d3
- Move the field access behind the check
...
# Only called from one place where the connection is checked, but
# playing safe, again (parfait)
2011-05-17 00:16:57 +00:00
Johannes Schlüter
9e5bc2c138
- Move the access behind the check.
...
# I can't find an unsafe call, but let's play safe
2011-05-16 10:15:28 +00:00
Johannes Schlüter
8ab4c89d0b
- Move the access behind the check.
...
# I can't find an unsafe call, but let's play safe
2011-05-16 10:15:28 +00:00
Johannes Schlüter
898e3095f1
- Move the access behind the check.
...
# I can't find an unsafe call, but let's play safe
2011-05-16 10:15:28 +00:00
Andrey Hristov
229bdc7ccb
Fix range
...
(thanks again nihen)
2011-05-10 07:15:22 +00:00
Andrey Hristov
9a197618b4
Fix range
...
(thanks again nihen)
2011-05-10 07:15:22 +00:00
Andrey Hristov
d4ae5bd995
Fix for bug 54674..typo in the check of SJIS
2011-05-09 16:20:35 +00:00
Andrey Hristov
6242101f2b
Fix for bug 54674..typo in the check of SJIS
2011-05-09 16:20:35 +00:00
Andrey Hristov
9bf9b88f20
add the BLOCK_LEAVE macro for non-gcc and non-win
2011-05-04 19:09:12 +00:00
Andrey Hristov
91bddbe26e
add the BLOCK_LEAVE macro for non-gcc and non-win
2011-05-04 19:09:12 +00:00
Andrey Hristov
3e46e95ac1
reorganize the DBG_ macros, add DBG_BLOCK_XXX
2011-05-04 19:05:19 +00:00
Andrey Hristov
84a309f87b
reorganize the DBG_ macros, add DBG_BLOCK_XXX
2011-05-04 19:05:19 +00:00
Andrey Hristov
2d5e51db05
fix valgrind warning
2011-05-04 10:35:04 +00:00
Andrey Hristov
5bac59b7d1
extend the API in the backward compatible way
2011-05-03 09:37:53 +00:00
Sebastian Bergmann
6f3148db81
Add optional argument to debug_backtrace() and debug_print_backtrace() to limit the amount of stack frames returned.
2011-04-09 09:52:24 +00:00
Pierre Joye
b7a99bbbb8
- fix build
2011-03-30 09:25:09 +00:00
Ulf Wendel
8138f7de40
Update of mysqlnd version. This has been forgotten when introducing set_autocommit, tx_commit, tx_rollback calls ( http://svn.php.net/viewvc?view=revision&revision=308669 ).
2011-03-25 10:45:28 +00:00