diff options
| author | unknown <mskold@mysql.com> | 2005-02-26 16:15:36 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-26 16:15:36 +0100 |
| commit | 7cc7a6285652ababf739953304b02cc7d0b92cda (patch) | |
| tree | f808846a5ff849df7616e3c21076d6367cf010b9 /sql/sql_class.h | |
| parent | 613d326a63e3aeb34b8b19406f1c1894654df73b (diff) | |
| parent | 8167f5e5ed35f1df7c2c32e126f0aa4e1d48c07a (diff) | |
| download | mariadb-git-7cc7a6285652ababf739953304b02cc7d0b92cda.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 662ee171367..2cd525f54bc 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1187,6 +1187,7 @@ public: bool slow_command; bool no_trans_update, abort_on_warning; bool got_warning; /* Set on call to push_warning() */ + bool no_warnings_for_error; /* no warnings on call to my_error() */ longlong row_count_func; /* For the ROW_COUNT() function */ sp_rcontext *spcont; // SP runtime context sp_cache *sp_proc_cache; @@ -1639,7 +1640,6 @@ public: class select_union :public select_result_interceptor { public: TABLE *table; - COPY_INFO info; TMP_TABLE_PARAM tmp_table_param; select_union(TABLE *table_par); |