diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-22 10:59:01 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-22 10:59:01 -0700 |
| commit | 024972e3b957270f7e233794376b36c1e5081c78 (patch) | |
| tree | 427dbb0d01c89bbe5247e812831348d8dc4cda3d /ext/mysql/php_mysql.c | |
| parent | 73b54b4a5b5e630a20512f08d1d976a2d17948de (diff) | |
| parent | bd20c7942334b48d5b8a854691e2db18fee921ab (diff) | |
| download | php-git-024972e3b957270f7e233794376b36c1e5081c78.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
fixed possible null deref
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Added recursivetreeiterator::setPostfix() method
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
backward compatibility
HASH_KEY_NON_EXISTANT fix
Update NEWS
Fixed bug #65304 (Use of max int in array_sum)
Updaet NEWS
Reorder NEWS
intl: remove extra quotes from arginfo params
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Properly fixed bug #63186 on NetBSD == 6.0
...
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index ba81a95e5f..3b50dd5ede 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -296,7 +296,7 @@ static const zend_function_entry mysql_functions[] = { #ifdef MYSQL_HAS_SET_CHARSET PHP_FE(mysql_set_charset, arginfo_mysql_set_charset) #endif - /* for downwards compatability */ + /* for downwards compatibility */ PHP_DEP_FALIAS(mysql, mysql_db_query, arginfo_mysql_db_query) PHP_DEP_FALIAS(mysql_fieldname, mysql_field_name, arginfo_mysql_field_name) PHP_DEP_FALIAS(mysql_fieldtable, mysql_field_table, arginfo_mysql_field_seek) |