diff options
| author | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
| commit | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (patch) | |
| tree | 5e021f37f7272c93926759b22f6e7823a584f542 /ext/mysqlnd/mysqlnd.h | |
| parent | 14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e (diff) | |
| parent | 8904fbc6929aaf623d88127f876fa739c9ec627b (diff) | |
| download | php-git-4f3ac2cdbedf7a84d64bfee7405f0c023641a806.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
NEWS
adapt test for error message introduce in fix for #68463
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
run a few request in this test
fix test
fix test
added info about some other macro changes
added note about toolset and phpize
added note about the response files
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
split formatter_format*.phpt for ICP 54.1
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
fix icu version to test
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
clone dateformat_calendars_variant3.phpt for ICU 54.1
split collator_get_sort_key_variant3.phpt for icu 54.1
...
Diffstat (limited to 'ext/mysqlnd/mysqlnd.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index aca440c273..2e45740abb 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -29,7 +29,7 @@ #define MYSQLND_STRING_TO_INT_CONVERSION /* - This force mysqlnd to do a single (or more depending on ammount of data) + This force mysqlnd to do a single (or more depending on amount of data) non-blocking read() calls before sending a command to the server. Useful for debugging, if previous function hasn't consumed all the output sent to it - like stmt_send_long_data() error because the data was larger that |