mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
70,928 Commits 500 Branches 1,381 Tags 818 MiB
e64da8c20d
Commit Graph

1071 Commits

Author SHA1 Message Date
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
Ulf Wendel
38fd7f48d0 Limit test with 65k params, should crash mysqlnd 2011-03-24 13:40:06 +00:00
Ulf Wendel
a270348c24 Limit test with 65k params, should crash mysqlnd 2011-03-24 13:40:06 +00:00
Ulf Wendel
1eb3bdd802 Coverage for a 'silent server protocol change' from the past for which both mysqlnd and libmysql have workarounds. 2011-03-23 08:57:52 +00:00
Ulf Wendel
8307f9e892 Coverage for a 'silent server protocol change' from the past for which both mysqlnd and libmysql have workarounds. 2011-03-23 08:57:52 +00:00
Ulf Wendel
afdcb5ecb4 Test coverage for some of the cases where LAST_INSERT_ID() and API *_insert_id() differ as documented in the MySQL manual in particular the C API reference section 2011-03-17 15:18:22 +00:00
Ulf Wendel
8bbd451647 Test coverage for some of the cases where LAST_INSERT_ID() and API *_insert_id() differ as documented in the MySQL manual in particular the C API reference section 2011-03-17 15:18:22 +00:00
Andrey Hristov
d903915f93 Fix for bug #54221 mysqli::get_warnings segfault when used in multi queries 2011-03-17 10:28:53 +00:00
Andrey Hristov
56cdee2def Fix for bug #54221 mysqli::get_warnings segfault when used in multi queries 2011-03-17 10:28:53 +00:00
Johannes Schlüter
7d0a6c3f8b - Fix tests. temp dir might be something other than /tmp 2011-02-22 14:49:32 +00:00
Johannes Schlüter
0448336c2c - Fix tests. temp dir might be something other than /tmp 2011-02-22 14:49:32 +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
Ulf Wendel
0b474317fd Don't expect a certain server reply, it is undefined what happens. 2011-01-28 13:41:02 +00:00
Ulf Wendel
267bf9b31b Don't expect a certain server reply, it is undefined what happens. 2011-01-28 13:41:02 +00:00
Ulf Wendel
b961a26705 Check PAM auth plugin build in to mysqlnd. I am afraid one cant do much better testing without making many assumptions on the server setup. 2011-01-25 17:00:30 +00:00
Ulf Wendel
a55e03aaff Fix tests: don't expect people to use a certain db/schema for testing 2011-01-17 13:06:44 +00:00
Ulf Wendel
ad8892f91d Fix tests: don't expect people to use a certain db/schema for testing 2011-01-17 13:06:44 +00:00
Kalle Sommer Nielsen
d244ac46a1 MFT: Added 'db' and 'catalog' keys to the field fetching functions (FR #39847) 2011-01-17 11:20:54 +00:00
Kalle Sommer Nielsen
5ba90aefb0 Added 'catalog' to the field fetching functions in mysqli (Thanks to Johannes for the headsup) 2011-01-17 10:43:53 +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
Kalle Sommer Nielsen
69a3575b38 Implemented FR #39847 (mysqli_fetch_[field|fields|field_direct] need to return db) 2011-01-07 18:25:55 +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
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
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
Kalle Sommer Nielsen
071513562d Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to call libmysql) 
# Based on patch by tre-php-net at crushedhat dot com
 2010-12-12 18:00:25 +00:00
Kalle Sommer Nielsen
b016c7ded7 Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to call libmysql) 
# Based on patch by tre-php-net at crushedhat dot com
 2010-12-12 18:00:25 +00:00
Kalle Sommer Nielsen
b529d43c0d Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA query) 2010-12-12 16:17:50 +00:00
Kalle Sommer Nielsen
7456f1d8f8 Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA query) 2010-12-12 16:17:50 +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
7ff7f9780e fix test after newly introduced constant 2010-12-02 19:11:41 +00:00
Andrey Hristov
9f045cd40e fix test after newly introduced constant 2010-12-02 19:11:41 +00:00
Andrey Hristov
18424910d3 and export the new constant 2010-12-02 14:21:23 +00:00
Andrey Hristov
334e62a77d and export the new constant 2010-12-02 14:21:23 +00:00
Ulf Wendel
1891feac44 Testing for the two new statistics 'bytes_received_real_data_normal' and 'bytes_received_real_data_ps' 2010-11-12 12:21:35 +00:00
Ulf Wendel
b343748d56 Testing for the two new statistics 'bytes_received_real_data_normal' and 'bytes_received_real_data_ps' 2010-11-12 12:21:35 +00:00
Andrey Hristov
332b953865 Fix bad types, because zend_parse_xxx expect signed integers 
for lengths, no matter how stupid this is :)
 2010-11-10 13:57:09 +00:00
Andrey Hristov
77d160772f Fix bad types, because zend_parse_xxx expect signed integers 
for lengths, no matter how stupid this is :)
 2010-11-10 13:57:09 +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
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
e38078bae9 fix broken merge, led to double define 2010-10-06 10:35:02 +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
Ulf Wendel
ccaff0e994 Greetings from SunCC. 
ext/mysqli/mysqli_driver.c", line 127|128|129: warning: syntax error:  empty declaration
 2010-10-05 12:42:53 +00:00
Ulf Wendel
cda3b82d6d Greetings from SunCC. 
ext/mysqli/mysqli_driver.c", line 127|128|129: warning: syntax error:  empty declaration
 2010-10-05 12:42:53 +00:00
Kalle Sommer Nielsen
cc1eaba454 Fixed compiler warnings in mysqli 
- mysqli.c: Fix unused variables, they are only used in non-mysqlnd mode
 - mysqli_api.c (PHP_5_3 only): Fix constness, add_property_string expects a char *, not a const char *
 - mysqli_prop.c: Cast to long, as its below the LONG_MAX and therefore safe
 - mysqli_result_iterator.c: Cast to ulong as the iterator member expects that rather than a my_longlong

# In trunk only warnings regarding the zend_property_info 
# structure is present and PHP_5_3 is warning free now
 2010-10-05 09:40:36 +00:00
Kalle Sommer Nielsen
87edd143ed Fixed compiler warnings in mysqli 
- mysqli.c: Fix unused variables, they are only used in non-mysqlnd mode
 - mysqli_api.c (PHP_5_3 only): Fix constness, add_property_string expects a char *, not a const char *
 - mysqli_prop.c: Cast to long, as its below the LONG_MAX and therefore safe
 - mysqli_result_iterator.c: Cast to ulong as the iterator member expects that rather than a my_longlong

# In trunk only warnings regarding the zend_property_info 
# structure is present and PHP_5_3 is warning free now
 2010-10-05 09:40:36 +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
Ulf Wendel
5aca10ee13 Trying to fix compiler warnings (on Windows). 2010-10-04 13:36:23 +00:00
Ulf Wendel
926ba0d9c7 Trying to fix compiler warnings (on Windows). 2010-10-04 13:36:23 +00:00
Ulf Wendel
122179478a Next one... ext/mysqli/mysqli_fe.c", line [many]: warning: syntax error: empty declaration 2010-10-04 10:43:21 +00:00
Ulf Wendel
d73ea7c93e Next one... ext/mysqli/mysqli_fe.c", line [many]: warning: syntax error: empty declaration 2010-10-04 10:43:21 +00:00
Ulf Wendel
4113fad4ec Fixing compiler warning "ext/mysqli/mysqli_prop.c", line [...]: warning: syntax error: empty declaration" 2010-10-04 10:40:16 +00:00
Ulf Wendel
ceb3b5cb22 Fixing compiler warning "ext/mysqli/mysqli_prop.c", line [...]: warning: syntax error: empty declaration" 2010-10-04 10:40:16 +00:00
Ulf Wendel
2d925fb216 Sorry for the commit but compiler warnings are annoying and so are white spaces at the end of a line, if one uses an editor which removes them on save and diff's get blown 
up by white space changes...

Changes: 
- remove end of line white space
- fix compiler warning "ext/mysqli/mysqli_priv.h:156:27: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli_fe.h:135:25: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli.c:896:11: warning: extra tokens at end of #ifdef directive"
 2010-10-04 10:02:58 +00:00
Ulf Wendel
e20c62d3be Sorry for the commit but compiler warnings are annoying and so are white spaces at the end of a line, if one uses an editor which removes them on save and diff's get blown 
up by white space changes...

Changes: 
- remove end of line white space
- fix compiler warning "ext/mysqli/mysqli_priv.h:156:27: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli_fe.h:135:25: warning: no newline at end of file"
- fix compiler warning "ext/mysqli/mysqli.c:896:11: warning: extra tokens at end of #ifdef directive"
 2010-10-04 10:02:58 +00:00
Ulf Wendel
bc6e920ebc Fix leak with persistent connections when using mysqli.default_host is used 2010-10-01 08:54:16 +00:00
Ulf Wendel
1781aec59f Fix leak with persistent connections when using mysqli.default_host is used 2010-10-01 08:54:16 +00:00
Andrey Hristov
60327d87a7 Plug a leak in mysqli when in the same script 
a pconn is reused.
Call end_psession earlier - so will mysqlnd and
the plugins free data earlier.
 2010-09-30 18:10:03 +00:00
Andrey Hristov
77d73b814b Plug a leak in mysqli when in the same script 
a pconn is reused.
Call end_psession earlier - so will mysqlnd and
the plugins free data earlier.
 2010-09-30 18:10:03 +00:00
Andrey Hristov
517fd63c32 fix the test 2010-09-29 11:40:57 +00:00
Andrey Hristov
9d6fa31713 fix the test 2010-09-29 11:40:57 +00:00
Andrey Hristov
6a43b14849 Fixed bug #45921 (Can't initialize character set hebrew) 
sorry for committing it separated
 2010-09-27 12:37:23 +00:00
Andrey Hristov
42a80fac8c Fixed bug #45921 (Can't initialize character set hebrew) 2010-09-27 12:35:59 +00:00
Ulf Wendel
8bb124394b Let's try not to have 'uft8'-only tests and avoid setting the charset upon connect. I've changed the tests to make no assumptions on the server charset setting. var_dump()/EXPECTF tests got replaced with dynamic tests which try to take the current charset into account. 2010-09-23 15:08:43 +00:00
Ulf Wendel
1ab38567b9 Let's try not to have 'uft8'-only tests and avoid setting the charset upon connect. I've changed the tests to make no assumptions on the server charset setting. var_dump()/EXPECTF tests got replaced with dynamic tests which try to take the current charset into account. 2010-09-23 15:08:43 +00:00
Ulf Wendel
389965f1de Merge from head: do not use deprecated function aliases. The test logic is unchanged. 2010-09-23 14:59:13 +00:00
Andrey Hristov
1af3e68880 Unify, force one charset at connect, thus fixing 
test failures because different servers have different
system charsets.
 2010-09-22 18:25:33 +00:00
Andrey Hristov
bdaec773b5 Unify, force one charset at connect, thus fixing 
test failures because different servers have different
system charsets.
 2010-09-22 18:25:33 +00:00
Ulf Wendel
44fba4d934 Test update for sql_mode = ansi 2010-09-22 15:22:22 +00:00
Ulf Wendel
7f0ec2a127 Test update for sql_mode = ansi 2010-09-22 15:22:22 +00:00
Andrey Hristov
c0528261d7 update tests 2010-09-22 11:09:29 +00:00
Andrey Hristov
047f0e4d88 update tests 2010-09-22 11:09:29 +00:00
Ulf Wendel
2ff0c392e7 Trying to pimp gcov.php.net code coverage tests.. trying to cover mysqlnd compress code with a standard test run 2010-09-20 19:01:13 +00:00
Ulf Wendel
10974d77f4 Trying to pimp gcov.php.net code coverage tests.. trying to cover mysqlnd compress code with a standard test run 2010-09-20 19:01:13 +00:00
Ulf Wendel
7f6d8e53fd Align test to the style used in the other tests 2010-09-20 18:26:11 +00:00
Ulf Wendel
f7c54d0737 Align test to the style used in the other tests 2010-09-20 18:26:11 +00:00
Ulf Wendel
1a40f20729 No reason not to run the tests with libmysql. Its long, long ago that pconnect has been a mysqlnd only feature 2010-09-20 17:26:39 +00:00
Ulf Wendel
579b5f2d63 No reason not to run the tests with libmysql. Its long, long ago that pconnect has been a mysqlnd only feature 2010-09-20 17:26:39 +00:00
Andrey Hristov
531085785b add test case for 52891 2010-09-20 09:02:31 +00:00
Andrey Hristov
e389303ef3 add test case for 52891 2010-09-20 09:02:31 +00:00
Ulf Wendel
0dc0d76854 Fix test 2010-09-15 08:20:15 +00:00
Andrey Hristov
fc2143b993 unify magic quotes handling. Also fix a problem which 
resulted in a longjmp in debug PHP,because of usage of
zval that is NULL in a hash context.
 2010-09-14 16:09:42 +00:00
Ulf Wendel
4789901728 Test for http://bugs.php.net/52221. Test will fail with mysqlnd but should pass with libmysql. 2010-09-03 14:20:32 +00:00
Ulf Wendel
d1f40f7439 Fix test failure. Add new test for MYSQLI_OPT_INT_AND_FLOAT_NATIVE mysqlnd feature. 2010-09-02 14:57:38 +00:00
Ulf Wendel
48814f96ef Fix test failure. Add new test for MYSQLI_OPT_INT_AND_FLOAT_NATIVE mysqlnd feature. 2010-09-02 14:57:38 +00:00
Ulf Wendel
42fea46887 Adding MYSQLI_OPT_SSL_VERIFY_SERVER_CERT for use with mysqli_options(). 2010-08-30 16:59:10 +00:00
Ulf Wendel
f671ad6275 Adding MYSQLI_OPT_SSL_VERIFY_SERVER_CERT for use with mysqli_options(). 2010-08-30 16:59:10 +00:00
Andrey Hristov
d9f50d95e3 Add proper magic_quotes_runtime support for mysqlnd, but 
in mysqli, so we don't need to tamper myslqnd.
magic_quotes_runtime are deprecated and not existant in 5.4, thus
only fixing in the branch.
 2010-08-26 14:51:58 +00:00
Ulf Wendel
6338f99d52 Test for http://bugs.mysql.com/bug.php?id=49406, Binding params doesn't work when selecting a date inside a CASE-WHEN 2010-08-26 13:35:20 +00:00
Ulf Wendel
db9667d2a5 Test for http://bugs.mysql.com/bug.php?id=49406, Binding params doesn't work when selecting a date inside a CASE-WHEN 2010-08-26 13:35:20 +00:00
Andrey Hristov
721f6dae57 fix the build. two mysqli functions were missing after 
recent commit - set_charset and get_charset
 2010-08-25 15:02:02 +00:00
Andrey Hristov
7a83093a3b fix the build. two mysqli functions were missing after 
recent commit - set_charset and get_charset
 2010-08-25 15:02:02 +00:00
Andrey Hristov
67ef72018f Fix for bug #52654 mysqli doesn't install headers with structures it uses 2010-08-20 12:25:17 +00:00
Andrey Hristov
27567040d2 Fix for bug #52654 mysqli doesn't install headers with structures it uses 2010-08-20 12:25:17 +00:00
Andrey Hristov
c204922c7f Added utf16 and utf32 support, as in MySQL 5.5, in mysqlnd. 
Fixed tests, so they don't try to use SET NAMES utf16|utf32,
as character_set_client can't be set to those (the lexer can't
read ucs2, utf16 and utf32).
Added support for 4-byte utf8, as found in MySQL 5.5
 2010-08-16 17:44:50 +00:00
Andrey Hristov
277c7d4dea Added utf16 and utf32 support, as in MySQL 5.5, in mysqlnd. 
Fixed tests, so they don't try to use SET NAMES utf16|utf32,
as character_set_client can't be set to those (the lexer can't
read ucs2, utf16 and utf32).
Added support for 4-byte utf8, as found in MySQL 5.5
 2010-08-16 17:44:50 +00:00
Andrey Hristov
0a9ca62a77 Fix test, so it doesn't fail with MySQL 5.5, where InnoDB 
is the default engine
 2010-08-16 16:15:15 +00:00
Andrey Hristov
5d54d79e04 Fix test, so it doesn't fail with MySQL 5.5, where InnoDB 
is the default engine
 2010-08-16 16:15:15 +00:00
Andrey Hristov
4d72dba301 detect easily which charset doesn't work 2010-08-16 16:13:55 +00:00
Andrey Hristov
3ed9d8fd85 detect easily which charset doesn't work 2010-08-16 16:13:55 +00:00
Kalle Sommer Nielsen
9806c21259 Changed mysqli_report() to be per-request specific rather than per-process specific (Fixes #52390) 2010-08-13 10:43:15 +00:00
Kalle Sommer Nielsen
e72a69aae6 Changed mysqli_report() to be per-request specific rather than per-process specific (Fixes #52390) 2010-08-13 10:43:15 +00:00
Andrey Hristov
aff34b2133 Fix for bug #52413 MySQLi build failure on OS X 2010-08-13 09:57:04 +00:00
Andrey Hristov
a6100682d0 Fix for bug #52413 MySQLi build failure on OS X 2010-08-13 09:57:04 +00:00
Andrey Hristov
d7b72a0494 Fix for bug #52433 Call to undefined method mysqli::poll() 2010-08-13 09:18:06 +00:00
Andrey Hristov
973e134d2d Fix for bug #52433 Call to undefined method mysqli::poll() 2010-08-13 09:18:06 +00:00
Andrey Hristov
4dece1a2a9 update tests 2010-07-07 15:53:34 +00:00
Andrey Hristov
e670162315 Cleanup in trunk. Remove some functions, noted in 
UPGRADING. sed-ed the tests to change the usage
to the real function name.
 2010-07-07 12:09:36 +00:00
Andrey Hristov
b580bc3875 Cleanup in trunk. Remove some functions, noted in 
UPGRADING. sed-ed the tests to change the usage
to the real function name.
 2010-07-07 12:09:36 +00:00
Andrey Hristov
ce1bd65d29 arginfo for mysqli, was too fast to commit in trunk instead of one 
directory up, thus the patch was split in two.
 2010-07-07 11:37:35 +00:00
Andrey Hristov
6900399d7e Arginfo for mysqli 2010-07-07 11:36:29 +00:00
Andrey Hristov
5a4a66cdd5 Fix for bug #52115 mysqli_result::fetch_all returns null, not an empty array 2010-06-18 17:25:41 +00:00
Andrey Hristov
c7f10efabc Fix for bug #52115 mysqli_result::fetch_all returns null, not an empty array 2010-06-18 17:25:41 +00:00
Andrey Hristov
2f838ef547 Fix the test for libmysql, which expects the certificates 
to be in the directory where the interpreter is started. When
using mysqlnd they should not include path and will be found
in the directory of the script.
 2010-06-14 18:23:17 +00:00
Andrey Hristov
0da5464a81 Fix the test for libmysql, which expects the certificates 
to be in the directory where the interpreter is started. When
using mysqlnd they should not include path and will be found
in the directory of the script.
 2010-06-14 18:23:17 +00:00
Andrey Hristov
4637e3641f And a fix for MySQL Server which is pre 5.1.23, which doesn't support 
preserving of the charset when performing change_user. This is libmysql
only code.
 2010-06-14 18:19:13 +00:00
Andrey Hristov
83051b1a86 And a fix for MySQL Server which is pre 5.1.23, which doesn't support 
preserving of the charset when performing change_user. This is libmysql
only code.
 2010-06-14 18:19:13 +00:00
Andrey Hristov
65b1895759 Fixed bug #52082 (character_set_client & character_set_connection reset after 
mysqli_change_user())

libmysql >= 5.1.23 will PASS, older library versions will fail
 2010-06-14 17:16:20 +00:00
Andrey Hristov
1d9c49bb3c Fixed bug #52082 (character_set_client & character_set_connection reset after 
mysqli_change_user())

libmysql >= 5.1.23 will PASS, older library versions will fail
 2010-06-14 17:16:20 +00:00
Ulf Wendel
afcb62ba1e Fixing tests 2010-06-10 13:40:13 +00:00
Ulf Wendel
6c0ddd0b6f Fixing tests 2010-06-10 13:40:13 +00:00
Ulf Wendel
aeae0d1bad Portability improvement 2010-06-08 14:57:10 +00:00
Ulf Wendel
01a9630946 Portability improvement 2010-06-08 14:57:10 +00:00
Ulf Wendel
3e5ac35bd9 Portability improvements 2010-06-08 14:29:05 +00:00
Ulf Wendel
0484919f62 Portability improvements 2010-06-08 14:29:05 +00:00
Ulf Wendel
6b1d256af5 More SQL strict mode updates 2010-06-08 13:05:49 +00:00
Ulf Wendel
7b27887091 More SQL strict mode updates 2010-06-08 13:05:49 +00:00
Ulf Wendel
949b509299 Making tests pass strict sql mode. 2010-06-08 10:55:12 +00:00
Ulf Wendel
0fb528edee Making tests pass strict sql mode. 2010-06-08 10:55:12 +00:00
Andrey Hristov
4a0b4494d4 defensive programming, check before using a resource 2010-06-01 14:16:27 +00:00
Andrey Hristov
c7831cbe27 defensive programming, check before using a resource 2010-06-01 14:16:27 +00:00
Andrey Hristov
4cd5db922b Fix test 2010-05-31 16:53:33 +00:00
Andrey Hristov
8fc1e91e61 Fix test 2010-05-31 16:53:33 +00:00
Ulf Wendel
c0a8ce2f61 Updating test to reflect the latest and more verbose mysqlnd error messages, updating mysqlnd error message as well. 2010-05-31 13:56:42 +00:00
Ulf Wendel
73a32c52d2 Updating test to reflect the latest and more verbose mysqlnd error messages, updating mysqlnd error message as well. 2010-05-31 13:56:42 +00:00
Ulf Wendel
9b334da667 Fixing test - make sure it checks the same conditions for libmysql and mysqlnd 2010-05-31 12:55:59 +00:00
Ulf Wendel
31aada825f Fixing test - make sure it checks the same conditions for libmysql and mysqlnd 2010-05-31 12:55:59 +00:00
Ulf Wendel
fb80ebe102 Fixing test 2010-05-31 12:22:48 +00:00
Ulf Wendel
c96feb3dda Fixing test 2010-05-31 12:22:48 +00:00
Ulf Wendel
4b5666a539 Fixing mysqli_stmt_attr_set @ libmysql 2010-05-31 12:10:04 +00:00
Ulf Wendel
f0446ca9e3 Fixing mysqli_stmt_attr_set @ libmysql 2010-05-31 12:10:04 +00:00
Ulf Wendel
ba6ee3fc06 Open server bug: mysqlnd works around it, libmysql fails. Let's skip because MySQL Server version tests are tricky and error prone. 2010-05-27 13:01:17 +00:00
Ulf Wendel
cc3db5cc65 Open server bug: mysqlnd works around it, libmysql fails. Let's skip because MySQL Server version tests are tricky and error prone. 2010-05-27 13:01:17 +00:00
Andrey Hristov
3aa95c59cc Check before use, because mysqlnd can return NULL 
and this will crash. However, this can happen only in case of OOM.
 2010-05-27 12:44:10 +00:00
Andrey Hristov
1228c92303 Check before use, because mysqlnd can return NULL 
and this will crash. However, this can happen only in case of OOM.
 2010-05-27 12:44:10 +00:00
Ulf Wendel
6356bcbbb9 Test fixes and updates to work with a wider range of MySQL server configs 2010-05-27 12:09:39 +00:00
Ulf Wendel
b094e5296b Test fixes and updates to work with a wider range of MySQL server configs 2010-05-27 12:09:39 +00:00
Andrey Hristov
44acaec542 Fix test 2010-05-26 13:36:49 +00:00
Andrey Hristov
0d468290be Fix test 2010-05-26 13:36:49 +00:00
Andrey Hristov
f9ad56eab9 Remove a function that has no usage. The zval cache was disabled/removed 
in 5.3.0-RC3.
 2010-05-26 13:30:19 +00:00
Andrey Hristov
d6458c3b1e Add checks to check the underlying pointer in the resource. 
It can happen that the underlying pointer is freed (like in
the case of connection reconnect), and then it cannot be allocated
anymore, which means that NULL will be used consequently by the
functions that fetch the resource and the crash is immediate.
 2010-05-26 07:28:43 +00:00
Andrey Hristov
ce682f1b26 Add checks to check the underlying pointer in the resource. 
It can happen that the underlying pointer is freed (like in
the case of connection reconnect), and then it cannot be allocated
anymore, which means that NULL will be used consequently by the
functions that fetch the resource and the crash is immediate.
 2010-05-26 07:28:43 +00:00
Dmitry Stogov
c5237d82bf Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties 2010-05-24 14:11:39 +00:00
Andrey Hristov
fb28410d8f Fix comment 2010-05-18 15:02:50 +00:00
Andrey Hristov
c91c86b743 Remove duplicated code. 
Use one centralized functions for data extraction.
 2010-05-18 11:50:31 +00:00
Andrey Hristov
940e64dba3 Remove duplicated code. 
Use one centralized functions for data extraction.
 2010-05-18 11:50:31 +00:00
Andrey Hristov
560169068d Update test file 2010-05-18 11:36:54 +00:00
Andrey Hristov
7dd13d56cc Add iterator to mysqli_result. Works both for : 
- USE_RESULT, can be iterated only once, kind of forward iterator
- STORE_RESULT, can be iterated multiple times
 2010-05-18 10:39:26 +00:00
Andrey Hristov
76fd19998d Somehow missed to commit this, for better fix for #51605 2010-05-13 11:06:00 +00:00
Andrey Hristov
87bac04bf1 Better fix for #51605 2010-05-13 11:05:09 +00:00
Andrey Hristov
6cefa510d6 Better fix for #51605 2010-05-13 11:05:09 +00:00
Andrey Hristov
d3b7aaa3fc One more time fixing the tests, lets use $IS_MYSQLND which comes from connect.inc 2010-05-11 15:55:07 +00:00
Andrey Hristov
70b6fd2ae4 One more time fixing the tests, lets use $IS_MYSQLND which comes from connect.inc 2010-05-11 15:55:07 +00:00
Andrey Hristov
cab261ea16 Fix for mysqli_stmt_execute.phpt, should be ran only against 
4.1+ servers. MySQL's SLEEP function is available since 5.0.12, thus
the tests that use this function should be ran only if the server
is at least 5.0.12.
 2010-05-11 15:49:03 +00:00
Andrey Hristov
ab232ebb09 Fix for mysqli_stmt_execute.phpt, should be ran only against 
4.1+ servers. MySQL's SLEEP function is available since 5.0.12, thus
the tests that use this function should be ran only if the server
is at least 5.0.12.
 2010-05-11 15:49:03 +00:00
Andrey Hristov
98585ccb37 These tests should be run only if mysqli uses mysqlnd. Part of fix for 
Bug #51712 Test mysql_mysqlnd_read_timeout_long must fail on MySQL4
 2010-05-11 15:27:03 +00:00
Andrey Hristov
fd6f3961f8 These tests should be run only if mysqli uses mysqlnd. Part of fix for 
Bug #51712 Test mysql_mysqlnd_read_timeout_long must fail on MySQL4
 2010-05-11 15:27:03 +00:00
Andrey Hristov
41ad139d17 Fix for bug #51605 (Mysqli zombie links) 2010-05-11 10:03:16 +00:00
Andrey Hristov
962aa93ec7 Fix for bug #51605 (Mysqli zombie links) 2010-05-11 10:03:16 +00:00
Andrey Hristov
b72437494b Add a test case for the recently fixed memleak 2010-04-29 13:19:57 +00:00
Andrey Hristov
60db5154d2 Add a test case for the recently fixed memleak 2010-04-29 13:19:57 +00:00
Andrey Hristov
16e4bd5d58 Try blob columns instead of int, and insert a lot of data at once 2010-04-29 12:07:02 +00:00
Andrey Hristov
d7abb57745 Try blob columns instead of int, and insert a lot of data at once 2010-04-29 12:07:02 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Andrey Hristov
3d900d4cad Fixed very rare memory leak in mysqlnd, when binding thousands of columns 2010-04-27 12:32:34 +00:00
Andrey Hristov
8546225b6e Fixed very rare memory leak in mysqlnd, when binding thousands of columns 2010-04-27 12:32:34 +00:00
Andrey Hristov
8525f7bb02 Test case for the buffer overflow in mysqlnd_change_user 2010-04-27 08:45:23 +00:00
Andrey Hristov
a00f8f4ea7 Test case for the buffer overflow in mysqlnd_change_user 2010-04-27 08:45:23 +00:00
Kalle Sommer Nielsen
cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Andrey Hristov
af6dd192b3 Fix for bug #51647 Certificate file without private key (pk in another file) doesn't work 2010-04-23 13:54:40 +00:00
Andrey Hristov
e9f9f66f2e Fix for bug #51647 Certificate file without private key (pk in another file) doesn't work 2010-04-23 13:54:40 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Felipe Pena
45b68febe9 - Fix mem. leak 2010-04-21 12:52:24 +00:00
Felipe Pena
623a25728a - Fix mem. leak 2010-04-21 12:52:24 +00:00
Dmitry Stogov
94dd83722b Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table 2010-04-20 10:57:45 +00:00
Andrey Hristov
dd9fc198ce Fix for bug#49234 method not found ssl_set 
Patch was tested and compiles on Windows. (Thanks Kalle)
 2010-04-15 11:01:30 +00:00
Andrey Hristov
c04f752625 Fix for bug#49234 method not found ssl_set 
Patch was tested and compiles on Windows. (Thanks Kalle)
 2010-04-15 11:01:30 +00:00
Andrey Hristov
be73f948d2 Fixing the second test 2010-04-08 13:18:52 +00:00
Andrey Hristov
4b2111d178 Fixing the second test 2010-04-08 13:18:52 +00:00
Andrey Hristov
48c3d20dd4 one more fix and both work with libmysql and mysqlnd 2010-04-08 10:53:38 +00:00
Andrey Hristov
4e441ef30b one more fix and both work with libmysql and mysqlnd 2010-04-08 10:53:38 +00:00
Andrey Hristov
8467978d7a Fix for bug #51026 ssl not working 2010-04-08 09:01:21 +00:00
Andrey Hristov
8338d48828 Fix for bug #51026 ssl not working 2010-04-08 09:01:21 +00:00
Andrey Hristov
840d2dc8a7 Another fix for the 16 chars user limitation of MySQL 2010-04-07 18:28:46 +00:00
Andrey Hristov
48392f04fa Another fix for the 16 chars user limitation of MySQL 2010-04-07 18:28:46 +00:00
Andrey Hristov
dfbe6cb392 Fix test. The usernames in the server are 16 chars long 2010-04-07 18:05:42 +00:00
Andrey Hristov
7670d2948d Fix test. The usernames in the server are 16 chars long 2010-04-07 18:05:42 +00:00
Andrey Hristov
94cd357f5b Make it coupled - what is allocated with mnd_ should be freed 
with mnd_ and vice versa.
Added mnd_pestrndup and mnd_pestrdup, which wrap the normal
calls to be able to track this calls.
Fixed some failing tests.
 2010-03-29 17:04:16 +00:00
Andrey Hristov
4870cac70e Make it coupled - what is allocated with mnd_ should be freed 
with mnd_ and vice versa.
Added mnd_pestrndup and mnd_pestrdup, which wrap the normal
calls to be able to track this calls.
Fixed some failing tests.
 2010-03-29 17:04:16 +00:00
Andrey Hristov
ec36ac1610 Fix tests that fail when the MySQL's socket file is not /tmp/mysql.sock 
as it is in when compiled from source and the default for mysqlnd.
SuSE for example uses /var/run/mysql/mysql.sock . Also, sql.safe_mode
(ext/mysql and ingres) needs the socket.
Fix possible crashes in mysqlnd. When packets are shorter, functions should
return error.
 2010-03-26 16:58:25 +00:00
Andrey Hristov
7868bca437 Fix tests that fail when the MySQL's socket file is not /tmp/mysql.sock 
as it is in when compiled from source and the default for mysqlnd.
SuSE for example uses /var/run/mysql/mysql.sock . Also, sql.safe_mode
(ext/mysql and ingres) needs the socket.
Fix possible crashes in mysqlnd. When packets are shorter, functions should
return error.
 2010-03-26 16:58:25 +00:00
Andrey Hristov
78887ff757 Fix a segfault when using a mysqli object after unsuccesssful connect, the 
handle should have been allocated with mysqli_init().
 2010-03-24 15:17:57 +00:00
Andrey Hristov
293ba72451 Fix a segfault when using a mysqli object after unsuccesssful connect, the 
handle should have been allocated with mysqli_init().
 2010-03-24 15:17:57 +00:00
Andrey Hristov
7496cc761e decouple the methods in MYSQLND_STMT from the data, 
needed to move to a new structure MYSQLND_STMT. Makes
the code cleaner and less error-prone.
Also fix PDO/MySQL which directly touch mysqlnd internals
instead of using API calls.
 2010-03-16 12:36:57 +00:00
Andrey Hristov
ccfd9cd744 allow persistency of PS 2010-03-12 13:03:46 +00:00
Johannes Schlüter
eb0de2af90 revert 293939 Fixed bug #50636 (MySQLi_Result sets values before calling 
constructor)
 2010-02-11 21:42:48 +00:00
Ulf Wendel
7c7d7ac1fa No idea which recent change has cause this little API change, however it is not a big change and maybe it is even an improvement. 2010-02-02 13:10:50 +00:00
Ulf Wendel
8aa8b6135b Tests related to #50727 2010-02-01 12:18:50 +00:00
Andrey Hristov
6407250e70 Fix for bug#50772 
mysqli constructor without parameters does not return a working mysqli object
 2010-01-25 13:23:32 +00:00
Andrey Hristov
36a037d236 Fix build of mysqli when libmysql is used, mysqlnd_portability.h 
might not be available for some weird reasons. Added the macros
that we need, in that case

Code by Jess Portnoy
 2010-01-14 09:47:57 +00:00
Ulf Wendel
795f716832 Updating test to new libmysql feature set (first introduced in MySQL 6.0 but now backported to MySQL 5.5). 2010-01-04 15:29:18 +00:00
Ulf Wendel
bd4c681a42 Fixing test 2010-01-04 14:59:04 +00:00
Ulf Wendel
bf9d5991ea Tweaking test. Andrey, you once requested such a test, please have a look if it does exactly what you want it to do. 2010-01-04 14:34:44 +00:00
Ulf Wendel
39e27c9030 The internal zval cache has been removed and not been reintroduced... remove corresponding test code 2010-01-04 13:44:10 +00:00
Pierrick Charron
614fd65795 Fixed bug #50636 (MySQLi_Result sets values before calling constructor) 2010-01-03 16:59:33 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Andrey Hristov
01adfaee5f Unify. The typedef-ed structs in mysqlnd are always capitalized. 2009-12-23 11:58:45 +00:00
Ulf Wendel
e2a2205a58 Test for what Andrey has found with 16M packets 2009-12-17 14:15:28 +00:00
Andrey Hristov
06a417b6a9 Remove stub code which never actually was used for anything. 
Things like this can be built on top of the core.
 2009-12-09 20:38:11 +00:00
Andrey Hristov
6f598e62ff Remove the zval caching from mysqlnd. It was disabled versions ago 
due to problems on windows, which were not debugged. Better have 
code that is disabled not in the core.
 2009-12-09 20:21:05 +00:00
Andrey Hristov
4d2735007d Remove disabled code - threaded fetching. This can be implemented 
on a upper level and by offloading it we reduce the complexity of
the core.
 2009-12-09 16:57:03 +00:00
Ulf Wendel
671ebe958a Adapting tests to accept actual behaviour found in 5.2, 5.3 and 6.0. The behaviour is wrong according to the documentation: mysqli_connect_error() should return an empty string (not NULL), if there is no error. However, changing this would break BC and most users will not notice the difference between NULL and empty string anyway. 2009-12-09 12:06:10 +00:00
Rasmus Lerdorf
2bdd3538de Fix broken build. 
This constant is not in older versions of MySQL.
 2009-12-01 21:39:19 +00:00
Rasmus Lerdorf
c6502213b4 Fix bug #49098 2009-11-12 01:09:16 +00:00
Ulf Wendel
5ed0015f62 mysqli won't accept empty string for socket, skip test of mysqli.default_socket if test run does not use socket 2009-11-04 16:56:32 +00:00
Ulf Wendel
4a95aa3989 Fix for bug #49965 . Let mysqli_options() try to cast option values to the appropriate type. 2009-11-03 14:56:04 +00:00
Ulf Wendel
00654b8a06 Fixing stats, updating test to accept new stats 2009-10-22 16:05:33 +00:00
Ulf Wendel
d356459971 There subtle differences between Linux and Win. mysqlnd is a bit more verbose on Win... silencing to make the test pass 2009-10-21 18:57:45 +00:00
Ulf Wendel
8df115c25e Making test a bit more portable 2009-10-20 17:54:57 +00:00
Ulf Wendel
03c3c1edb3 Fixing test 2009-10-20 17:03:32 +00:00
Ulf Wendel
3258a6572d libmysql is still 'buggy' - skip test with libmysql 2009-10-20 14:11:43 +00:00
Ulf Wendel
3fb67347ea Well, hacking around to cope with mysql version specific behaviour if using libmysql... 2009-10-20 13:58:57 +00:00
Ulf Wendel
87a4f09cbf Skipping tests if InnoDB is available but disabled. I wonder what InnoDB status comes next... 2009-10-20 12:41:58 +00:00
Ulf Wendel
57c1b63c2d Fixing typo in SKIPIF and partly skipping tests if using remote MySQL because LOAD LOCAL INFILE will fail 2009-10-20 12:31:04 +00:00
Ulf Wendel
eb0e09f5dc Using require[_once] instead of include. Adding logic to connect.inc to detect multiple inclusions of connect.inc which leads to a Fatal error because of my_mysqli_connect() function redefinition. Some tests did include connect.inc twice -> run-tests - even the one from trunk - did not detect Fatal error in SKIPIF -> false-positive test result... 2009-10-19 20:07:25 +00:00
Ulf Wendel
344d6803ec mysqlnd is a bit more verbose than libmysql - silence mysqlnd here for easier comparison of test results. 2009-10-19 16:07:10 +00:00
Ulf Wendel
f610cdd9a2 MySQL server and metadata - a sad story... trying to make the test pass with a few more server versions 2009-10-19 12:55:11 +00:00
Ulf Wendel
d01d398bad Fixing host info for TCP/IP and aligning mysqlnd and libmysql 2009-10-19 12:09:48 +00:00
Ulf Wendel
3eeaf566e0 Extending mysqlnd statistics/monitoring. Now counting COM_* commands. 2009-10-16 13:02:01 +00:00
Ulf Wendel
d8dc47d58f Making mysqlnd emit no warnings when fetching pooled persistent connections that have timed out or are unusable for any other reason - bug #49761 2009-10-15 20:46:08 +00:00
Ulf Wendel
ab4670ee53 Fixing problems when calling connect (again and again) on a valid connection handle. Most of the patch comes from Andrey. 2009-10-15 15:49:40 +00:00
Ulf Wendel
5cb8e9b22a Updating test because of http://news.php.net/php.cvs/60561 2009-10-01 08:56:28 +00:00