diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
| commit | 932646b1ff6a8f5815a961340a9e1ee4702f5b44 (patch) | |
| tree | 5bc42ace8ae1f7e4d00baffd468bdb7564e851f1 /sql/sp_head.cc | |
| parent | 0bb30f3603b519780eaf3fe0527b1c6af285229a (diff) | |
| parent | 33492ec8d4e2077cf8e07d0628a959d8729bd1f9 (diff) | |
| download | mariadb-git-932646b1ff6a8f5815a961340a9e1ee4702f5b44.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 06a2022d914..6b048cec68b 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2002, 2013, Oracle and/or its affiliates. - Copyright (c) 2011, 2013, Monty Program Ab + Copyright (c) 2002, 2016, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, MariaDB 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 @@ -514,8 +514,10 @@ sp_name::init_qname(THD *thd) bool check_routine_name(LEX_STRING *ident) { - if (!ident || !ident->str || !ident->str[0] || - ident->str[ident->length-1] == ' ') + DBUG_ASSERT(ident); + DBUG_ASSERT(ident->str); + + if (!ident->str[0] || ident->str[ident->length-1] == ' ') { my_error(ER_SP_WRONG_NAME, MYF(0), ident->str); return TRUE; |