diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
| commit | 8ce6c9fc6c3091c43ab91980fe904ed5125ba597 (patch) | |
| tree | 49da2620373e1b4c73d505405819d5d7097786bc /sql/sql_class.h | |
| parent | f67891c24422a223a50a2477883e587c520057ad (diff) | |
| parent | e229fe9801cc9fb7e3783cf708bc7cb695606c64 (diff) | |
| download | mariadb-git-8ce6c9fc6c3091c43ab91980fe904ed5125ba597.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysys/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index ab9230e5f01..a053db72e64 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -344,8 +344,8 @@ struct system_variables { ulonglong myisam_max_extra_sort_file_size; ulonglong myisam_max_sort_file_size; - ulonglong select_limit; - ulonglong max_join_size; + ha_rows select_limit; + ha_rows max_join_size; ulong bulk_insert_buff_size; ulong join_buff_size; ulong long_query_time; |