diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
| commit | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (patch) | |
| tree | 9e2bc4700a2db961d967e53f00c941f3ee501173 /sql/sql_parse.cc | |
| parent | cfa0c6ff1d8f7268f895d79daf94e7d29197327d (diff) | |
| parent | ff3da0f963b28d128005da8ca5d0c93a72d34b27 (diff) | |
| download | mariadb-git-869f5d0e81d5cbecaec3605f292fbb363b9ccbf6.tar.gz | |
Merge with alias as String
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 0cbccf3bedd..50d45fdfa69 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5104,9 +5104,8 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables) String str(buff,(uint32) sizeof(buff), system_charset_info); str.length(0); thd->lex->unit.print(&str, QT_ORDINARY); - str.append('\0'); push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, - ER_YES, str.ptr()); + ER_YES, str.c_ptr_safe()); } if (res) result->abort(); |