diff options
| author | igor@hundin.mysql.fi <> | 2003-04-24 18:42:06 +0300 |
|---|---|---|
| committer | igor@hundin.mysql.fi <> | 2003-04-24 18:42:06 +0300 |
| commit | 517a287ec9deb7d0dc118283489220eb9cc3fd59 (patch) | |
| tree | a35abb53e7d184e2d91ba326f1ca741eaf2df2b5 /sql/set_var.cc | |
| parent | 855a6b82745c9d9e16b8855e5cfe9805bc8ebdb9 (diff) | |
| parent | 4b78926bb372aa3f4a5c2a3575129453c9860c41 (diff) | |
| download | mariadb-git-517a287ec9deb7d0dc118283489220eb9cc3fd59.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d39a506c82d..be71df60bd6 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -167,6 +167,8 @@ sys_var_thd_ulong sys_pseudo_thread_id("pseudo_thread_id", sys_var_thd_ha_rows sys_max_join_size("max_join_size", &SV::max_join_size, fix_max_join_size); +sys_var_thd_ulong sys_max_length_for_sort_data("max_length_for_sort_data", + &SV::max_length_for_sort_data); #ifndef TO_BE_DELETED /* Alias for max_join_size */ sys_var_thd_ha_rows sys_sql_max_join_size("sql_max_join_size", &SV::max_join_size, @@ -381,6 +383,7 @@ sys_var *sys_variables[]= &sys_max_error_count, &sys_max_heap_table_size, &sys_max_join_size, + &sys_max_length_for_sort_data, &sys_max_prep_stmt_count, &sys_max_sort_length, &sys_max_tmp_tables, @@ -534,6 +537,9 @@ struct show_var_st init_vars[]= { {sys_max_delayed_threads.name,(char*) &sys_max_delayed_threads, SHOW_SYS}, {sys_max_heap_table_size.name,(char*) &sys_max_heap_table_size, SHOW_SYS}, {sys_max_join_size.name, (char*) &sys_max_join_size, SHOW_SYS}, + {sys_max_length_for_sort_data.name, + (char*) &sys_max_length_for_sort_data, + SHOW_SYS}, {sys_max_prep_stmt_count.name,(char*) &sys_max_prep_stmt_count, SHOW_SYS}, {sys_max_sort_length.name, (char*) &sys_max_sort_length, SHOW_SYS}, {sys_max_user_connections.name,(char*) &sys_max_user_connections, SHOW_SYS}, |