Andrey Hristov
33701b76ae
fix macros
2011-05-31 10:35:07 +00:00
Andrey Hristov
6c2f42b544
exchange a "trap" with an error
2011-05-17 09:44:11 +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
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
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
91bddbe26e
add the BLOCK_LEAVE macro for non-gcc and non-win
2011-05-04 19:09:12 +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
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
e7a5fb405e
Fix compressed build, make it easier
2011-03-23 17:14:28 +00:00
Andrey Hristov
3ffac762b0
palloc is long dead, use more appropriate name
2011-03-22 14:39:58 +00:00
Andrey Hristov
a6d4f047d4
Fix message
2011-03-22 14:39:36 +00:00
Andrey Hristov
cfb01aab63
remove more unneeded includes
2011-03-22 12:54:02 +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
59c5875f83
move from macros to functions, which can be overwritten, if needed
2011-02-25 12:25:36 +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
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
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
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
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
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
59dc221530
- 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
61d49db1f3
new flag
2011-01-10 15:14:56 +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
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
b51abfb35f
fix a small bug about affected_rows in the text protocol
2010-12-16 12:56:19 +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
69894eaf80
count preciser in case of error
2010-12-15 14:14:58 +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
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
e183ea0495
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
Pierre Joye
87fd3737b4
-fix build
2010-11-15 23:53:13 +00:00
Andrey Hristov
bcb4c8427e
two new stats
2010-11-05 20:07:34 +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
da633ed52e
gettimeofday for windows
2010-10-28 14:14:06 +00:00
Andrey Hristov
9920be1a81
show tracing
2010-10-28 14:07:36 +00:00
Andrey Hristov
099a505f89
fix windows debug build
...
better zlib detection
2010-10-28 13:46:54 +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
a25ce8c606
last piece to enable trace logging on windows
2010-10-22 14:34:33 +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
74ec58a045
new collations
2010-10-08 09:15:31 +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
63d6892b56
more variable hiding fixes
2010-10-06 07:09:37 +00:00
Andrey Hristov
b373ccd6fc
fix shadowing of parameters
2010-10-06 06:08:55 +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
c7a09c682d
two more compiler warnings fixed - size does matter
2010-10-05 17:10:47 +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
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
60bfedb1e6
rename parameter, should not conflict with global symbol -
...
the socket function
2010-10-05 16:27:49 +00:00
Andrey Hristov
07c08c1c93
remove trailing commas in enums
2010-10-05 14:56:49 +00:00
Andrey Hristov
a9da84800e
add some safe casts
2010-10-05 11:08:21 +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
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
Andrey Hristov
d4b1c1ec78
fix recent TSRM build break, with --enable-debug
2010-10-05 08:17:33 +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
026da7d4a0
fix two more warnings
2010-10-04 14:52:14 +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
bf3b607f7a
Fix const-ness
2010-10-04 13:54:30 +00:00
Andrey Hristov
d7b26d2987
Even better patch
2010-10-04 12:59:29 +00:00
Andrey Hristov
5f06ac5caf
don't define twice the macro on some platforms
2010-10-04 12:41:12 +00:00
Ulf Wendel
500cd35c21
Fixing compiler warning.
2010-10-04 10:58:05 +00:00
Ulf Wendel
5d6f3fb908
Fixing "ext/mysqlnd/mysqlnd.h", line 287: warning: syntax error: empty declaration"
2010-10-04 10:51:44 +00:00