diff options
author | unknown <pem@mysql.com> | 2006-03-02 14:54:04 +0100 |
---|---|---|
committer | unknown <pem@mysql.com> | 2006-03-02 14:54:04 +0100 |
commit | 7865ce6188cd45dfc9b5d074912a78ce6683a55e (patch) | |
tree | a7840376ad020d0f7c4277e6d8d827d19113d851 /sql/item.h | |
parent | 7968f058732edf54047035201a11be50041c314e (diff) | |
download | mariadb-git-7865ce6188cd45dfc9b5d074912a78ce6683a55e.tar.gz |
Fixed BUG#17476: Stored procedure not returning data when it is called first
time per connection
Removed const_string() method from Item_string (it was only used in one
place, in a bad way). Defer possible SP variable, and access data directly
instead, in date_format item.
mysql-test/r/sp.result:
Updated results for new test (BUG#17476).
mysql-test/t/sp.test:
New test case (BUG#17476)
sql/item.h:
Removed const_string() from Item_string.
It was only used in one place, and we can just use str_value in Item directly.
sql/item_timefunc.cc:
Must defer a (possible) local SP variable to use max_length and str_value
in Item_func_date_format::fix_length_and_dec(), and refer to str_value
directly without the const_string() method (now removed); the cast didn't
work in all cases anyway.
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index a859b067632..2e3e0acc408 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1585,7 +1585,6 @@ public: str_value.length(), collation.collation); } Item *safe_charset_converter(CHARSET_INFO *tocs); - String *const_string() { return &str_value; } inline void append(char *str, uint length) { str_value.append(str, length); } void print(String *str); // to prevent drop fixed flag (no need parent cleanup call) |