diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-14 16:30:42 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-14 16:30:42 +0300 |
| commit | d1ed51db824c8335dc6b4617d09b600f3c918506 (patch) | |
| tree | 4445ce330ecd2c7419a678e20a6bddde7a287c9c | |
| parent | 74ea459412f9a479ea1385a72cc27b4245c06435 (diff) | |
| download | mariadb-git-d1ed51db824c8335dc6b4617d09b600f3c918506.tar.gz | |
Fixed bug in SET enum_system_variable=NULL
BitKeeper/etc/ignore:
added scripts/make_sharedlib_distribution
mysql-test/r/variables.result:
Add test for enum_system_variable=NULL
mysql-test/t/variables.test:
Add test for enum_system_variable=NULL
sql/set_var.cc:
Fixed bug in SET enum_system_variable=NULL
Moved some array elements to get result sorted
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 11 |
4 files changed, 11 insertions, 5 deletions
diff --git a/.bzrignore b/.bzrignore index 7bdc90fd76a..3dcf46841d9 100644 --- a/.bzrignore +++ b/.bzrignore @@ -539,3 +539,4 @@ scripts/make_win_src_distribution libmysql/vio_priv.h libmysql_r/vio_priv.h hardcopy.0 +scripts/make_sharedlib_distribution diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 50e97120de6..8afdced206b 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -244,6 +244,8 @@ set myisam_max_sort_file_size=100; Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL set myisam_max_extra_sort_file_size=100; Variable 'myisam_max_extra_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL +set @@SQL_WARNINGS=NULL; +Variable 'sql_warnings' can't be set to the value of 'NULL' set autocommit=1; set big_tables=1; select @@autocommit, @@big_tables; diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 6a3264741ad..8e38160c60b 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -153,6 +153,8 @@ select @@global.sql_auto_is_null; set myisam_max_sort_file_size=100; --error 1229 set myisam_max_extra_sort_file_size=100; +--error 1231 +set @@SQL_WARNINGS=NULL; # Test setting all variables diff --git a/sql/set_var.cc b/sql/set_var.cc index dd2f90845c9..642f7c21ce3 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -394,9 +394,9 @@ sys_var *sys_variables[]= &sys_quote_show_create, &sys_rand_seed1, &sys_rand_seed2, + &sys_range_alloc_block_size, &sys_read_buff_size, &sys_read_rnd_buff_size, - &sys_range_alloc_block_size, &sys_rpl_recovery_rank, &sys_safe_updates, &sys_select_limit, @@ -555,11 +555,11 @@ struct show_var_st init_vars[]= { {sys_query_cache_type.name, (char*) &sys_query_cache_type, SHOW_SYS}, #endif /* HAVE_QUERY_CACHE */ {sys_query_prealloc_size.name, (char*) &sys_query_prealloc_size, SHOW_SYS}, + {sys_range_alloc_block_size.name, (char*) &sys_range_alloc_block_size, + SHOW_SYS}, {sys_read_buff_size.name, (char*) &sys_read_buff_size, SHOW_SYS}, {sys_readonly.name, (char*) &sys_readonly, SHOW_SYS}, {sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size, SHOW_SYS}, - {sys_range_alloc_block_size.name, (char*) &sys_range_alloc_block_size, - SHOW_SYS}, {sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank, SHOW_SYS}, {sys_server_id.name, (char*) &sys_server_id, SHOW_SYS}, {sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout, SHOW_SYS}, @@ -972,7 +972,8 @@ byte *sys_var_thd_bool::value_ptr(THD *thd, enum_var_type type) bool sys_var::check_enum(THD *thd, set_var *var, TYPELIB *enum_names) { - char buff[80], *value; + char buff[80]; + const char *value; String str(buff,sizeof(buff)), *res; if (var->value->result_type() == STRING_RESULT) @@ -982,7 +983,7 @@ bool sys_var::check_enum(THD *thd, set_var *var, TYPELIB *enum_names) (ulong) find_type(res->c_ptr(), enum_names, 3)-1)) < 0) { - value=res->c_ptr(); + value= res ? res->c_ptr() : "NULL"; goto err; } } |