diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-21 21:15:48 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-21 21:15:48 +0200 |
| commit | faa0c00eba05bc549afa26d6b8c22767384d3cf1 (patch) | |
| tree | 3a8cc6b267e12ab825770b0f18f3a66f0cb1877f /sql/sql_prepare.cc | |
| parent | 789340bc5fc3b996f79593442e116554d52f84f2 (diff) | |
| parent | fe63e095816a744950e3a3f6d978f074fd3fcd93 (diff) | |
| download | mariadb-git-faa0c00eba05bc549afa26d6b8c22767384d3cf1.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
sql/ha_federated.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index c285b70c7f6..d405f0791fb 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1929,7 +1929,7 @@ static const char *get_dynamic_sql_string(LEX *lex, uint *query_len) variable absent or equal to NULL, so we need to set variable to something reasonable to get a readable error message during parsing */ - str.set("NULL", 4, &my_charset_latin1); + str.set(STRING_WITH_LEN("NULL"), &my_charset_latin1); } needs_conversion= String::needs_conversion(var_value->length(), |