Commit Graph

920 Commits

Author SHA1 Message Date
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
Andrey Hristov
133ba9b5dd fix buffer overflow - overwriting with 0x0, due to
unchecked buffer size. This can be easily workarouned on 
existing unpatched systems by increasing
mysqlnd.net_cmd_buffer_size ini variable to more than 8k
2011-03-24 16:12:18 +00:00
Andrey Hristov
8b33e6fae0 fix buffer overflow - overwriting with 0x0, due to
unchecked buffer size. This can be easily workarouned on 
existing unpatched systems by increasing
mysqlnd.net_cmd_buffer_size ini variable to more than 8k
2011-03-24 16:12:18 +00:00
Andrey Hristov
e7a5fb405e Fix compressed build, make it easier 2011-03-23 17:14:28 +00:00
Andrey Hristov
3c364cbe52 Fix compressed build, make it easier 2011-03-23 17:14:28 +00:00
Andrey Hristov
5572becc81 palloc is long dead, use more appropriate name 2011-03-22 14:39:58 +00:00
Andrey Hristov
3ffac762b0 palloc is long dead, use more appropriate name 2011-03-22 14:39:58 +00:00
Andrey Hristov
3595f09c28 Fix message 2011-03-22 14:39:36 +00:00
Andrey Hristov
a6d4f047d4 Fix message 2011-03-22 14:39:36 +00:00
Andrey Hristov
081b001ca1 remove more unneeded includes 2011-03-22 12:54:02 +00:00
Andrey Hristov
cfb01aab63 remove more unneeded includes 2011-03-22 12:54:02 +00:00
Andrey Hristov
9484248c0a remove unneeded includes 2011-03-22 12:22:16 +00:00
Andrey Hristov
15fd9c4f58 remove unneeded includes 2011-03-22 12:22:16 +00:00
Andrey Hristov
3afdf62df0 throw out legacy code, that never was used for something
useful. Was added for QC but QC is now a plugin, not part of
the core.
2011-03-21 13:58:11 +00:00
Andrey Hristov
f06443593e add a proxy for sppintf and vspprintf 2011-03-18 14:56:20 +00:00
Andrey Hristov
c90df5850b WS 2011-03-18 13:55:25 +00:00
Andrey Hristov
2d2d1c7335 new function/methods - mysqlnd_stmt_flush. Removing
code duplication
2011-03-18 13:35:33 +00:00
Andrey Hristov
ca5df2a8bb less trace info 2011-03-18 12:33:17 +00:00
Andrey Hristov
8c14436f73 split mysqlnd_debug.c in 3 files 2011-03-18 11:58:46 +00:00
Andrey Hristov
34846cff4d Remove unused macros 2011-03-16 14:10:59 +00:00
Andrey Hristov
5d9b15feb1 allocate persistently 2011-03-16 12:42:59 +00:00
Andrey Hristov
4a38256394 compiler warnings fixed 2011-03-16 11:51:56 +00:00
Andrey Hristov
2a9e82d020 even better fix 2011-02-25 16:55:27 +00:00
Andrey Hristov
5373a3949c fix plugin counting, this is trunk only 2011-02-25 16:44:39 +00:00
Andrey Hristov
a5348bed31 use ifdef all-around in the revert 2011-02-25 13:11:49 +00:00
Andrey Hristov
2eb5b0fe4e revert also the version_id 2011-02-25 12:52:46 +00:00
Andrey Hristov
d4a1f5ac06 revert to previous behavior 2011-02-25 12:52:21 +00:00
Andrey Hristov
59c5875f83 move from macros to functions, which can be overwritten, if needed 2011-02-25 12:25:36 +00:00
Andrey Hristov
113cd9dc0f move from macros to functions, which can be overwritten, if needed 2011-02-25 12:25:36 +00:00
Andrey Hristov
7a1f54ff42 fix invalid memory read. Thank you, valgrind 2011-02-21 16:24:37 +00:00
Andrey Hristov
2e30412f20 fix invalid memory read. Thank you, valgrind 2011-02-21 16:24:37 +00:00
Andrey Hristov
eb0dd2b8ab fixed a problem in mysqlnd. 0 was always as num_rows returned for
unbuffered sets (text protocol and PS).
2011-02-16 16:36:33 +00:00
Andrey Hristov
1bdc780d30 fixed a problem in mysqlnd. 0 was always as num_rows returned for
unbuffered sets (text protocol and PS).
2011-02-16 16:36:33 +00:00
Andrey Hristov
c9e94fe753 Fix more warnings about size_t 2011-02-01 19:30:22 +00:00
Andrey Hristov
01745fa657 Fix more warnings about size_t 2011-02-01 19:30:22 +00:00
Andrey Hristov
44cd358f04 fix warnings. These checks are not needed because
param_no is unsigned, it wasn't in the beginning.
2011-02-01 16:55:20 +00:00
Andrey Hristov
6157793026 fix warnings. These checks are not needed because
param_no is unsigned, it wasn't in the beginning.
2011-02-01 16:55:20 +00:00
Andrey Hristov
23437f011c Add two new enums constants from the server 2011-01-31 13:52:21 +00:00
Andrey Hristov
423000075f Add two new enums constants from the server 2011-01-31 13:52:21 +00:00
Andrey Hristov
d82b05a64b Don't lose this data anymore. It worked without the fix,
but it with it is just correct (trunk only).
2011-01-31 13:29:18 +00:00
Kalle Sommer Nielsen
c924dedb73 Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL) 2011-01-31 12:47:28 +00:00
Kalle Sommer Nielsen
ddcac10dd1 Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL) 2011-01-31 12:47:28 +00:00
Kalle Sommer Nielsen
c8a25b87f1 Use our own zend_strndup() implementation of strndup() -- Fixes build on platforms without strndup(), like Windows 2011-01-31 12:32:32 +00:00
Andrey Hristov
2e3e86b996 clear error before doing anything, because we can get
trapped by previous error :
php -r '$link = mysqli_init();
var_dump($link->real_connect("127.0.0.1", "unknown", "unknown"));
var_dump($link->real_connect("127.0.0.1", "known", "password"));'

shows the problem. The second connect did not work, as it should be.
2011-01-28 17:33:14 +00:00
Andrey Hristov
c2887dd8f5 a better habitat 2011-01-27 18:51:12 +00:00
Andrey Hristov
942ea00eea fix a crash in new code 2011-01-27 17:30:29 +00:00
Andrey Hristov
2cdc51e580 fix typos 2011-01-24 13:59:28 +00:00
Andrey Hristov
4439bde560 small cleanups 2011-01-24 13:58:18 +00:00
Andrey Hristov
ce4e6f4db5 Handle MySQL 5.5 authentication features.
Authentication protocol can be changed, a new raw
packet is introduced, which includes only the "encrypted"
data for the auth plugin, sent after change protocol (0xFE)
is sent to the client.
2011-01-24 12:34:47 +00:00
Andrey Hristov
f1cb5e6253 fix zts build 2011-01-19 18:09:17 +00:00
Andrey Hristov
87a2104c1a fix ZTS build 2011-01-19 17:51:02 +00:00
Pierre Joye
0c665f0996 - fix the fix (wrong test) 2011-01-18 10:29:26 +00:00
Pierre Joye
b3efabda4c - fix the fix (wrong test) 2011-01-18 10:29:26 +00:00
Pierre Joye
a1b2df31d6 - don't try to access if calloc fails (quick review of its usage: seems that the stats member is validated in other places, to be confirmed) 2011-01-17 14:07:40 +00:00
Pierre Joye
e3785f253e - don't try to access if calloc fails (quick review of its usage: seems that the stats member is validated in other places, to be confirmed) 2011-01-17 14:07:40 +00:00
Pierre Joye
59dc221530 - fix NULL derefencing 2011-01-17 14:01:01 +00:00
Pierre Joye
5c23366d6b - fix NULL derefencing 2011-01-17 14:01:01 +00:00
Kalle Sommer Nielsen
2d9325ec2c Fix mysqlnd build 2011-01-16 15:44:48 +00:00
Andrey Hristov
16c6ce94d2 Update on the mysqlnd auth plugins, changed the plugin
structure and where they load themselves.
0xFE packets (method switch) needs to be done, additional
wire-level packet to be created to be parsed and the packet
doesn't fit the PACKET_OK structure anymore.
2011-01-14 20:04:17 +00:00
Andrey Hristov
5ca5c2bf43 Change things to allow passing of the password length
to mysqlnd. This is needed as a password might include
a \0 and thus we need to be binary safe.
2011-01-14 13:00:42 +00:00
Andrey Hristov
429e07bba2 grok the MySQL 5.5 extended handshake.
Move the authentication routines, the native ones, to
separate file and encapsulate them in a plugin.
Depending on the server version and what the server
requests (or doesn't in old versions) load the authentication
plugin to handle it.
Currently only the 4.1+ authentication is supported. More to come
2011-01-12 21:40:05 +00:00
Andrey Hristov
ddbbcdce49 Use common code to handle initial authentication and
COM_CHANGE_USER
2011-01-11 13:02:57 +00:00
Andrey Hristov
00eaff1528 plug a leak 2011-01-10 15:28:52 +00:00
Andrey Hristov
21fba3513a new flag 2011-01-10 15:14:56 +00:00
Andrey Hristov
61d49db1f3 new flag 2011-01-10 15:14:56 +00:00
Andrey Hristov
eaaef0d870 Proper fix for
Bug #53503      mysqli::query returns false after successful LOAD DATA query
which fixes als #56349, same behavior but in ext/mysql. Both due to a bug
in mysqlnd. Never was a problem with libmysql.
Also fixed the 53503's test case as it always reported PASS, even when there
should have been a failure.
2011-01-07 14:22:30 +00:00
Andrey Hristov
5549e066f2 Proper fix for
Bug #53503      mysqli::query returns false after successful LOAD DATA query
which fixes als #56349, same behavior but in ext/mysql. Both due to a bug
in mysqlnd. Never was a problem with libmysql.
Also fixed the 53503's test case as it always reported PASS, even when there
should have been a failure.
2011-01-07 14:22:30 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Andrey Hristov
d8774af125 C89 fix 2010-12-28 16:41:39 +00:00
Andrey Hristov
cfac5f5b67 extending the API interface - plugins can register
themselves with a structure and can be searched.
Every plugin can have statistics and they are shown
under the statistics of mysqlnd in MINFO.
2010-12-28 15:16:21 +00:00
Andrey Hristov
17b8336047 fix a small bug about affected_rows in the text protocol 2010-12-16 12:56:19 +00:00
Andrey Hristov
b51abfb35f fix a small bug about affected_rows in the text protocol 2010-12-16 12:56:19 +00:00
Andrey Hristov
4e08abeead Fix sprintf modifier to be right, wrong data reported in the log 2010-12-16 12:18:54 +00:00
Andrey Hristov
47bb667a64 Fix sprintf modifier to be right, wrong data reported in the log 2010-12-16 12:18:54 +00:00
Andrey Hristov
f35b89c7c4 count preciser in case of error 2010-12-15 14:14:58 +00:00
Andrey Hristov
69894eaf80 count preciser in case of error 2010-12-15 14:14:58 +00:00
Pierre Joye
aea6771d19 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Andrey Hristov
85b434465c enable again after 5.3.4 has already been tagged 2010-12-08 21:55:29 +00:00
Andrey Hristov
fc6e70d8e4 switch this off for the release 2010-12-07 11:13:55 +00:00
Andrey Hristov
27ecaa7901 Skip additional result sets sent by MySQL 5.5 servers
which break the Protocol API 
(see http://bugs.mysql.com/bug.php?id=58700)
2010-12-06 13:59:14 +00:00
Andrey Hristov
5efdfee8c6 Skip additional result sets sent by MySQL 5.5 servers
which break the Protocol API 
(see http://bugs.mysql.com/bug.php?id=58700)
2010-12-06 13:59:14 +00:00
Andrey Hristov
e183ea0495 don't crash if the API is used incorrectly 2010-12-06 13:50:51 +00:00
Andrey Hristov
03fd10c479 don't crash if the API is used incorrectly 2010-12-06 13:50:51 +00:00
Andrey Hristov
ee15ed307e new server constant as of 5.5 2010-12-02 13:59:56 +00:00
Andrey Hristov
3da811a124 new server constant as of 5.5 2010-12-02 13:59:56 +00:00
Andrey Hristov
4adcc3c7bc add a comment 2010-12-01 10:16:51 +00:00
Pierre Joye
87fd3737b4 -fix build 2010-11-15 23:53:13 +00:00
Pierre Joye
4af7de49aa - fix build 2010-11-15 23:46:21 +00:00
Andrey Hristov
837391a9a7 two new stats 2010-11-05 20:07:34 +00:00
Andrey Hristov
bcb4c8427e two new stats 2010-11-05 20:07:34 +00:00
Andrey Hristov
c10af225c4 - More features for the profiling, create aggregates and dump them
on file close.
- Also add a trace modifier to switch on and off the profiling.
- With additional compiler switch the profiling can be completely omitted,
of course it makes sense only when --enable-debug. Because otherwise
there is no tracing, thus no profiling.
- Added a fix for Windows for handling trace files on different devices
 (special handing of ':' )
2010-10-29 15:02:39 +00:00
Andrey Hristov
769a3cf0c3 - More features for the profiling, create aggregates and dump them
on file close.
- Also add a trace modifier to switch on and off the profiling.
- With additional compiler switch the profiling can be completely omitted,
of course it makes sense only when --enable-debug. Because otherwise
there is no tracing, thus no profiling.
- Added a fix for Windows for handling trace files on different devices
 (special handing of ':' )
2010-10-29 15:02:39 +00:00
Andrey Hristov
cd6ea54deb gettimeofday for windows 2010-10-28 14:14:06 +00:00
Andrey Hristov
da633ed52e gettimeofday for windows 2010-10-28 14:14:06 +00:00
Andrey Hristov
443bedf204 show tracing 2010-10-28 14:07:36 +00:00
Andrey Hristov
9920be1a81 show tracing 2010-10-28 14:07:36 +00:00
Andrey Hristov
4c34cd9f38 fix windows debug build
better zlib detection
2010-10-28 13:46:54 +00:00
Andrey Hristov
099a505f89 fix windows debug build
better zlib detection
2010-10-28 13:46:54 +00:00
Andrey Hristov
762a1b2d26 rename and remove usage of inttypes.h, not needed 2010-10-25 13:44:11 +00:00
Andrey Hristov
e70b2fcda4 rename and remove usage of inttypes.h, not needed 2010-10-25 13:44:11 +00:00
Andrey Hristov
fe719c5e42 profiling in trace mode 2010-10-22 15:46:26 +00:00
Andrey Hristov
924bb78167 profiling in trace mode 2010-10-22 15:46:26 +00:00
Andrey Hristov
4cedb6d08a last piece to enable trace logging on windows 2010-10-22 14:34:33 +00:00
Andrey Hristov
a25ce8c606 last piece to enable trace logging on windows 2010-10-22 14:34:33 +00:00
Andrey Hristov
f7c44c8c4d enable debug logging on windows, in debug builds, of course 2010-10-22 14:12:45 +00:00
Andrey Hristov
76783dfeb5 enable debug logging on windows, in debug builds, of course 2010-10-22 14:12:45 +00:00
Andrey Hristov
93d7715e7b new collations 2010-10-08 09:15:31 +00:00
Andrey Hristov
74ec58a045 new collations 2010-10-08 09:15:31 +00:00
Andrey Hristov
2d2d6f84ba fix some uninitialized variables. also fix shadowing of global symbols 2010-10-07 13:49:00 +00:00
Andrey Hristov
0e519d247e fix some uninitialized variables. also fix shadowing of global symbols 2010-10-07 13:49:00 +00:00
Andrey Hristov
1f9cf93cac Fix for Bug #52686 mysql_stmt_attr_[gs]et arg. points to incorrect type 2010-10-06 11:11:02 +00:00
Andrey Hristov
4f62c099cd Fix for Bug #52686 mysql_stmt_attr_[gs]et arg. points to incorrect type 2010-10-06 11:11:02 +00:00
Andrey Hristov
1cca9d4bf1 more variable hiding fixes 2010-10-06 07:09:37 +00:00
Andrey Hristov
63d6892b56 more variable hiding fixes 2010-10-06 07:09:37 +00:00
Andrey Hristov
062ddaa700 fix shadowing of parameters 2010-10-06 06:08:55 +00:00
Andrey Hristov
b373ccd6fc fix shadowing of parameters 2010-10-06 06:08:55 +00:00
Andrey Hristov
82de444f9a rename parameter name - should not shadow the global symbol alloca 2010-10-05 17:20:00 +00:00
Andrey Hristov
223832c501 rename parameter name - should not shadow the global symbol alloca 2010-10-05 17:20:00 +00:00
Andrey Hristov
eb2908c3f7 two more compiler warnings fixed - size does matter 2010-10-05 17:10:47 +00:00
Andrey Hristov
c7a09c682d two more compiler warnings fixed - size does matter 2010-10-05 17:10:47 +00:00
Andrey Hristov
25e84b6a23 Rename a method so it doesn't clash with a global symbol - a function
Fix compiler waring by extening the type of a variable
2010-10-05 17:03:50 +00:00
Andrey Hristov
396402fc97 Rename a method so it doesn't clash with a global symbol - a function
Fix compiler waring by extening the type of a variable
2010-10-05 17:03:50 +00:00
Andrey Hristov
3daf54ffa0 Fix compiler warnings - on 32bit size_t is smaller than uint64_t, although
we will never hit this the compiler should be happy.
2010-10-05 16:54:14 +00:00
Andrey Hristov
de69927b8e Fix compiler warnings - on 32bit size_t is smaller than uint64_t, although
we will never hit this the compiler should be happy.
2010-10-05 16:54:14 +00:00
Andrey Hristov
548661d96d rename parameter, should not conflict with global symbol -
the socket function
2010-10-05 16:27:49 +00:00
Andrey Hristov
60bfedb1e6 rename parameter, should not conflict with global symbol -
the socket function
2010-10-05 16:27:49 +00:00
Andrey Hristov
e97a07ae9e remove trailing commas in enums 2010-10-05 14:56:49 +00:00
Andrey Hristov
07c08c1c93 remove trailing commas in enums 2010-10-05 14:56:49 +00:00
Andrey Hristov
bf7e6f930c add some safe casts 2010-10-05 11:08:21 +00:00
Andrey Hristov
a9da84800e add some safe casts 2010-10-05 11:08:21 +00:00
Andrey Hristov
c4e145b0bc fixing more types 2010-10-05 10:30:00 +00:00
Andrey Hristov
75ed0bbb3e fixing more types 2010-10-05 10:30:00 +00:00
Andrey Hristov
a3f2895e67 fix types 2010-10-05 08:56:21 +00:00
Andrey Hristov
df2261df2a fix types 2010-10-05 08:56:21 +00:00
Ulf Wendel
b3dfb56949 Fix warnings
ext\mysqlnd\mysqlnd_result_meta.c(57) : warning C4090: 'initializing' : different 'const' qualifiers
ext\mysqlnd\mysqlnd_result_meta.c(64) : warning C4090: 'initializing' : different 'const' qualifiers
ext\mysqli\mysqli_report.c(50) : warning C4013: 'php_mysqli_throw_sql_exception' undefined; assuming extern returning int
2010-10-05 08:29:54 +00:00
Ulf Wendel
234181f690 Fix warnings
ext\mysqlnd\mysqlnd_result_meta.c(57) : warning C4090: 'initializing' : different 'const' qualifiers
ext\mysqlnd\mysqlnd_result_meta.c(64) : warning C4090: 'initializing' : different 'const' qualifiers
ext\mysqli\mysqli_report.c(50) : warning C4013: 'php_mysqli_throw_sql_exception' undefined; assuming extern returning int
2010-10-05 08:29:54 +00:00
Andrey Hristov
d4b1c1ec78 fix recent TSRM build break, with --enable-debug 2010-10-05 08:17:33 +00:00
Andrey Hristov
4c88033aa2 fix recent TSRM build break, with --enable-debug 2010-10-05 08:17:33 +00:00
Kalle Sommer Nielsen
54624f9902 We do not need this TSRMLS_FETCH() call as we do not use any TSRM stuff in here, so we can get
a minor boost here in ZTS mode.
2010-10-04 21:04:25 +00:00
Kalle Sommer Nielsen
304bc60e98 We do not need this TSRMLS_FETCH() call as we do not use any TSRM stuff in here, so we can get
a minor boost here in ZTS mode.
2010-10-04 21:04:25 +00:00
Andrey Hristov
a4ad111454 fix two more warnings 2010-10-04 14:52:14 +00:00
Andrey Hristov
026da7d4a0 fix two more warnings 2010-10-04 14:52:14 +00:00
Andrey Hristov
9f73a4e045 add some safe casts - lower the number of warnings by 2 2010-10-04 14:12:31 +00:00
Andrey Hristov
0a5c631488 add some safe casts - lower the number of warnings by 2 2010-10-04 14:12:31 +00:00
Andrey Hristov
4c63a2232d Fix const-ness 2010-10-04 13:54:30 +00:00
Andrey Hristov
bf3b607f7a Fix const-ness 2010-10-04 13:54:30 +00:00
Andrey Hristov
159ed311cc Even better patch 2010-10-04 12:59:29 +00:00
Andrey Hristov
d7b26d2987 Even better patch 2010-10-04 12:59:29 +00:00
Andrey Hristov
cacd5ad924 don't define twice the macro on some platforms 2010-10-04 12:41:12 +00:00
Andrey Hristov
5f06ac5caf don't define twice the macro on some platforms 2010-10-04 12:41:12 +00:00
Ulf Wendel
1f9a7fd758 Fixing compiler warning. 2010-10-04 10:58:05 +00:00
Ulf Wendel
500cd35c21 Fixing compiler warning. 2010-10-04 10:58:05 +00:00