diff options
| author | konstantin@mysql.com <> | 2005-09-22 02:11:21 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-09-22 02:11:21 +0400 |
| commit | 6f8d3c4844e7f7dd760f09a5ab8ad309d1d690d6 (patch) | |
| tree | c670884265eea87654bb764c095e254eff48128d /sql/sql_lex.h | |
| parent | e89c5220b54fe74d1afc1361f91e18b164e90e33 (diff) | |
| download | mariadb-git-6f8d3c4844e7f7dd760f09a5ab8ad309d1d690d6.tar.gz | |
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 76ea7f5c270..7de3463e1e2 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -432,10 +432,6 @@ public: { return my_reinterpret_cast(st_select_lex*)(slave); } - st_select_lex* first_select_in_union() - { - return my_reinterpret_cast(st_select_lex*)(slave); - } st_select_lex_unit* next_unit() { return my_reinterpret_cast(st_select_lex_unit*)(next); @@ -445,8 +441,7 @@ public: void exclude_tree(); /* UNION methods */ - bool prepare(THD *thd, select_result *result, ulong additional_options, - const char *tmp_table_alias); + bool prepare(THD *thd, select_result *result, ulong additional_options); bool exec(); bool cleanup(); inline void unclean() { cleaned= 0; } @@ -462,7 +457,10 @@ public: friend void lex_start(THD *thd, uchar *buf, uint length); friend int subselect_union_engine::exec(); + + List<Item> *get_unit_column_types(); }; + typedef class st_select_lex_unit SELECT_LEX_UNIT; /* |