Merge branch 'PHP-5.3' into PHP-5.4

bump year

remove old unicode code, that is was compiled out by using a macro

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/mysqlnd/mysqlnd_ps.c

merge fix for bug#62046

Fix for bug#62046

Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().

Stmt's state was changed to STMT_PREPARED and leads the driver to th

Fix for bug#62046

Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().

Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.

show more ...

Merge branch 'PHP-5.3' into PHP-5.4

Fix for bug#61411

Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the roo

Fix for bug#61411

Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.

show more ...

- Year++

- Year++

Split struct MYSQLND in struct MYSQLND and struct MYSQLD_CONN_DATA.
A step in the direction of keeping internal data private

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

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

show more ...

move plugin specific stuff to one file. create object factory
for similar objects

shift code around to two new files - mysqlnd_driver.c
and mysqlnd_ext_plugin.c (mysqlnd extension plugin)

- fix TS build

Fixed Windows build

add query information to the trace log

function rename to comply with the schema of other callbacks

function rename to comply with the schema of other callbacks

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(

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

show more ...

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.

add a proxy for sppintf and vspprintf

WS

new function/methods - mysqlnd_stmt_flush. Removing
code duplication

less trace info

compiler warnings fixed