1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00

Merge branch 'mysql-5.1' into mysql-5.5

This commit is contained in:
Sreeharsha Ramanavarapu
2015-07-10 07:54:55 +05:30
11 changed files with 173 additions and 47 deletions

View File

@ -1,7 +1,7 @@
#ifndef SQL_STRING_INCLUDED
#define SQL_STRING_INCLUDED
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -432,4 +432,7 @@ static inline bool check_if_only_end_space(CHARSET_INFO *cs, char *str,
return str+ cs->cset->scan(cs, str, end, MY_SEQ_SPACES) == end;
}
bool
validate_string(CHARSET_INFO *cs, const char *str, uint32 length,
size_t *valid_length, bool *length_error);
#endif /* SQL_STRING_INCLUDED */