Xinchen Hui
446c60c616
Various bug fixes (now 17 tests fails, it is 11 in trunk)
2014-05-11 17:02:08 +08:00
Xinchen Hui
2402d6cbbc
Refactor MySQLi (incompleted, only compilable now)
2014-05-11 14:53:18 +08:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Andrey Hristov
aad7b72472
Use API instead of directly acessing the structure
2014-02-25 17:39:06 +02:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Johannes Schlüter
0aa45f4a2a
Fix bug #61003 mysql_stat() require a valid connection
2012-03-06 00:15:40 +00:00
Xinchen Hui
19a663d02d
unnecessay slash
2012-01-17 14:32:01 +00:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +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
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
069e495b5f
null the value before usage
2011-10-08 14:48:14 +00:00
Andrey Hristov
26dd8c52c4
Be consistent, add mysqli::stat property, as equivalent of mysqli_stat().
...
Fix for Bug #55859 mysqli->stat property access gives error
2011-10-06 11:25:05 +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
4d31e1d143
fix warnings due to change in zend_property_info (structure extended in the middle!!)
2011-08-02 13:41:20 +00:00
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +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
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
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
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
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
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Andrey Hristov
10bc558aca
MFH: Revert in regard of my_ulonglong which should be used instead of long
...
which can be anything.
2009-05-27 15:05:28 +00:00
Kalle Sommer Nielsen
f02ebe4a08
MFH: Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql
2009-05-20 08:30:12 +00:00
Johannes Schlüter
74cfc5f3d7
MFH Fix #45940 MySQLI OO does not populate connect_error property on failed
...
connect
2009-01-12 12:56:01 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Andrey Hristov
825034cea5
MFH:
...
Asynchronous queries for mysqli, when mysqlnd is enabled.
Includes 4 tests for mysqli_poll
2008-11-18 17:02:18 +00:00
Andrey Hristov
abf612ba59
MFH: Remove unneeded cast
2008-11-10 20:06:23 +00:00
Ilia Alshanetsky
757087553b
MFH: Fixed compiler warnings
2008-11-10 19:04:05 +00:00
Andrey Hristov
4f5895a4d2
MFH: Fix warnings in sprintf
2008-10-31 20:31:27 +00:00
Andrey Hristov
caf3e9c3f1
Fixed a bunch of bugs reported in
...
Bug #44352 mysqli_connect_error() false negative for host errors
From now on the mysqli object doesn't have that magic properties, like
error, which were readable but not visible through isset(), property_exists()
and var_dump(). All other ext/mysqli classes were fixed too.
Now it will be easier to debug mysqli based applications.
2008-03-18 16:57:31 +00:00
Andrey Hristov
7932ccba6d
More optimizations - less MM calls
...
Clearly separated fetching (physical reading) from decoding phases (data
interpretation). Threaded fetching added but disabled as needs more work for
Windows. For Linux needs some touches to add pthreads if this is enabled,
probably with a compile-time switch.
The code reorganisation makes it easy to add also async API, similar to
cURL's one.
2008-01-28 18:25:50 +00:00
Sebastian Bergmann
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
Andrey Hristov
1421ccd4c0
Fix bug due to shadowing of variables. This one is pretty-pretty rare,
...
caught by source code inspection.
2007-10-16 12:55:05 +00:00
Andrey Hristov
8b9b553aa2
Import mysqlnd
...
Patch ext/mysql and ext/mysqli to support mysqlnd
2007-10-05 21:23:56 +00:00
Marcus Boerger
50ea26760d
- Avoid sprintf, even when checked copy'n'paste or changes lead to errors
2007-02-24 02:17:47 +00:00
Sebastian Bergmann
4223aa4d5e
MFH: Bump year.
2007-01-01 09:36:18 +00:00
Georg Richter
0944a47107
fixed bigint conversion on windows platforms
2006-04-05 12:17:08 +00:00
Georg Richter
b97b088800
fixed stmt property container and required status for error properties
2006-04-03 05:48:50 +00:00
Georg Richter
b3a437fcc4
Fix for bug #36802 (server crashes with invalid/not opened connections)
...
Added status to mysqli_resource:
MYSQLI_STATUS_UNKNOWN
MYSQLI_STATUS_CLEARED (for future use)
MYSQLI_STATUS_INITIALIZED (after mysqli_init and mysqli_stmt_init)
MYSQLI_STATUS_VALID (for valid objects)
removed valid flag
changed MYSQLI_FETCH_RESOURCE
added last parameter __check which specifies the status
2006-03-24 09:32:24 +00:00
Antony Dovgal
1e8aad5075
MFH: add checks and fix possible reincarnations of bug #36420
2006-02-16 20:58:59 +00:00
foobar
5bd93221a8
bump year and license version
2006-01-01 12:51:34 +00:00
foobar
23e671a51e
- Bumber up year
2005-08-03 14:08:58 +00:00
Joe Orton
6974b5ecce
Mark more private functions as static.
2005-03-30 13:43:36 +00:00
Joe Orton
5aa95520cd
Mark private functions as static.
2005-03-30 12:56:58 +00:00
Georg Richter
32aaa6a7be
fixed a bug in mysql_affected_rows and mysql_stmt_affected_rows
...
in case affected_rows function returns (my_ulonglong) -1 for errors.
(Thanks to Antony Dovgal for reporting this bug)
2005-01-28 17:35:37 +00:00
Georg Richter
0b4c108bd7
Added new classes:
...
mysqli_driver
mysqli_warning
mysqli_exception
mysqli_sql_exception
Improved embedded server support
changed testsuite to work also with embedded server
Made statement and resultset classes extendable
minor fixes
2005-01-07 14:59:59 +00:00
Georg Richter
57fa54af2d
added property 'id' to retrieve statement id (required by PEAR DB, to support
...
mysqli prepared statements)
2004-12-29 11:46:13 +00:00
Georg Richter
f0f08ec32b
fixed windows compile errors (Thx to Sebastian Bergmann)
2004-12-06 05:15:03 +00:00