summaryrefslogtreecommitdiff
path: root/ext/mysqli
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Fix failing tests""Xinchen Hui2014-12-263-10/+10
* Re-apply part fix of 4e2c016Xinchen Hui2014-12-252-1/+6
* Fixed testXinchen Hui2014-12-251-0/+2
* Revert "Fix failing tests"Xinchen Hui2014-12-255-16/+11
* Micro optimaztion (yeah, I know compiler supposed to do that)Xinchen Hui2014-12-221-2/+2
* Use "float" and "integer" in typehint and zpp errorsAndrea Faulds2014-12-213-3/+3
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-1312-410/+408
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-134-10/+11
|\
| * Merge branch 'zppFailOnOverflow'Andrea Faulds2014-12-133-8/+9
| |\
| | * Fix MySQLi testsAndrea Faulds2014-11-293-8/+9
| * | Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some curre...Guilherme Blanco2014-12-121-2/+2
| |/
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-264-8/+8
|\ \ | |/
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-234-8/+8
* | converted some ext/mysql* and fixed ext/zlibAnatol Belski2014-10-154-4/+13
* | bring back all the TSRMLS_FETCH() stuffAnatol Belski2014-10-151-1/+2
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-131-1/+1
|\ \ | |/
| * fix signed/unsigned mismatch warningAnatol Belski2014-10-131-1/+1
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-062-3/+3
|\ \ | |/
| * Merge branch 'pr/647'Tjerk Meesters2014-10-062-3/+3
| |\
| | * Merge branch 'master' into catchable-fatals/methods-on-non-objectsTimm Friebe2014-09-2537-187/+181
| | |\
| | * \ MFHTimm Friebe2014-08-1629-1020/+1032
| | |\ \
| | * | | Adjust expected fatal error messageTimm Friebe2014-07-062-2/+2
| | * | | Merge in changes from masterTimm Friebe2014-07-066-11/+19
| | |\ \ \
| | * | | | Make E_RECOVERABLE_ERRORs (4096) show upTimm Friebe2014-04-191-1/+1
| | * | | | Adjust expected outcome (non-Zend tests)Timm Friebe2014-04-192-2/+2
* | | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-011-120/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-120/+0
| | |_|_|/ | |/| | |
* | | | | remove fetches from mysqlikrakjoe2014-09-261-2/+1
|/ / / /
* | | | Move smart_str implementation into Zend/Nikita Popov2014-09-212-2/+2
* | | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-2017-20/+20
|\ \ \ \
| * | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-1917-17/+17
| * | | | Fixed useless or duplicated IS_INTERNED() checksDmitry Stogov2014-09-191-3/+3
* | | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-202-3/+3
|/ / / /
* | | | fix typeAnatol Belski2014-08-281-2/+2
* | | | Changed 'unsigned size_t' to 'size_t'Tjerk Meesters2014-08-281-1/+1
* | | | 's' works with size_t round 2Anatol Belski2014-08-272-7/+7
* | | | first show to make 's' work with size_tAnatol Belski2014-08-273-14/+14
* | | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-252-3/+3
* | | | master renamings phase 5Anatol Belski2014-08-251-7/+7
* | | | master renames phase 3Anatol Belski2014-08-253-18/+18
* | | | master renames phase 1Anatol Belski2014-08-2512-303/+303
* | | | fixes to %pd format usageAnatol Belski2014-08-242-5/+5
* | | | yet trivial fixes to mysql extsAnatol Belski2014-08-212-8/+8
* | | | ported ext/mysqliAnatol Belski2014-08-198-108/+108
* | | | basic macro replacements, all at onceAnatol Belski2014-08-199-211/+211
* | | | Merge branch 'master' of git.php.net:php-srcDmitry Stogov2014-08-1811-18/+118
|\ \ \ \
| * | | | typofixesVeres Lajos2014-08-171-1/+1
| | |_|/ | |/| |
| * | | Fixed version idXinchen Hui2014-08-161-1/+1
| * | | Merge branch 'PHP-5.6'Keyur Govande2014-08-159-16/+116
| |\ \ \
| | * \ \ Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-08-159-16/+116
| | |\ \ \
View Lorry Controller Status