diff options
| author | unknown <mskold@mysql.com> | 2005-02-23 20:08:21 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-23 20:08:21 +0100 |
| commit | e0b2dab77d0f8166c710c3b97faede85fa4e847c (patch) | |
| tree | 39850a76391a37d7bb293ee60cef5c74305a7ba9 /sql/sql_class.h | |
| parent | 137136d2a5c1339579fbe3138945827b529b668d (diff) | |
| parent | 29d2b6f6bc73058e6e7deb13f672ab5a68095f02 (diff) | |
| download | mariadb-git-e0b2dab77d0f8166c710c3b97faede85fa4e847c.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/log.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index f3bae1a0269..1a6a024b225 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -46,9 +46,9 @@ extern const char **errmesg; #define TC_LOG_PAGE_SIZE 8192 #define TC_LOG_MIN_SIZE (3*TC_LOG_PAGE_SIZE) extern uint opt_tc_log_size; -extern uint tc_log_max_pages_used; -extern uint tc_log_page_size; -extern uint tc_log_page_waits; +extern ulong tc_log_max_pages_used; +extern ulong tc_log_page_size; +extern ulong tc_log_page_waits; #define TC_HEURISTIC_RECOVER_COMMIT 1 #define TC_HEURISTIC_RECOVER_ROLLBACK 2 @@ -1614,10 +1614,12 @@ public: /* If >0 convert all blob fields to varchar(convert_blob_length) */ uint convert_blob_length; CHARSET_INFO *table_charset; + bool schema_table; TMP_TABLE_PARAM() :copy_field(0), group_parts(0), - group_length(0), group_null_parts(0), convert_blob_length(0) + group_length(0), group_null_parts(0), convert_blob_length(0), + schema_table(0) {} ~TMP_TABLE_PARAM() { |