diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-04-08 23:08:38 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-04-08 23:08:38 +0300 |
| commit | b09c0acd4ef124c33111c48a76be987500ff39f9 (patch) | |
| tree | 7c9a1c1a36d23a814477640768d0f7af6aaa6e68 /sql/strfunc.cc | |
| parent | 8b0c4b7773ca86d7b68338aefd1627753eaeb0fd (diff) | |
| download | mariadb-git-b09c0acd4ef124c33111c48a76be987500ff39f9.tar.gz | |
Fixed wrong test for extra_ip_sock that caused mysqld to die on Mac if --extra-port was used
sql/sql_string.cc:
Optimized tests to do fewer reallocs
sql/strfunc.cc:
Indentation fix
Diffstat (limited to 'sql/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index c03365cfc2b..d6f9784e4ad 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -38,7 +38,8 @@ static const char field_separator=','; -ulonglong find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs, +ulonglong find_set(TYPELIB *lib, const char *str, uint length, + CHARSET_INFO *cs, char **err_pos, uint *err_len, bool *set_warning) { CHARSET_INFO *strip= cs ? cs : &my_charset_latin1; |