diff options
| author | Sreeharsha Ramanavarapu <sreeharsha.ramanavarapu@oracle.com> | 2015-07-10 07:54:55 +0530 |
|---|---|---|
| committer | Sreeharsha Ramanavarapu <sreeharsha.ramanavarapu@oracle.com> | 2015-07-10 07:54:55 +0530 |
| commit | c773b320ffce5fa51782b26c979bda23dd8dbc03 (patch) | |
| tree | 43664139b8bc731b83082285ee1d5738dbf38a8e /sql/sql_string.h | |
| parent | 7255ae6ceb20c67d09fd153558d9a14372142f8b (diff) | |
| parent | 33a2e5abd86727155b629246445d508bb2cd02c0 (diff) | |
| download | mariadb-git-c773b320ffce5fa51782b26c979bda23dd8dbc03.tar.gz | |
Merge branch 'mysql-5.1' into mysql-5.5
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 971af9ea91a..95b39f5e15e 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -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 */ |