diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-14 20:25:50 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-14 20:25:50 +0100 |
| commit | f42419e4b3ee12aad381a7e9e4e219b74252921c (patch) | |
| tree | 0501a5801c892812a3f56959e6aa170d5999ba4f /sql/sql_select.h | |
| parent | d60c11be844d3daa1632b0dd0320a44ca74ecffd (diff) | |
| parent | c03b4b725553d7b03e79aa8717bc23567863a12e (diff) | |
| download | mariadb-git-f42419e4b3ee12aad381a7e9e4e219b74252921c.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
strings/ctype-bin.c:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index c5411a8790b..ffc98548db4 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -174,7 +174,7 @@ class JOIN :public Sql_alloc Item_sum **sum_funcs; Procedure *procedure; Item *having; - Item *tmp_having; // To store Having when processed tenporary table + Item *tmp_having; // To store Having when processed temporary table uint select_options; select_result *result; TMP_TABLE_PARAM tmp_table_param; @@ -306,7 +306,6 @@ class store_key :public Sql_alloc { protected: Field *to_field; // Store data here - Field *key_field; // Copy of key field char *null_ptr; char err; public: |