diff options
| -rw-r--r-- | mysql-test/r/func_time.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 8 | ||||
| -rw-r--r-- | sql/set_var.cc | 4 | ||||
| -rw-r--r-- | sql/sql_class.h | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
6 files changed, 25 insertions, 2 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index d8491035f0b..38fe97a79a6 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -96,6 +96,11 @@ week(19981231,2) week(19981231,3) week(20000101,2) week(20000101,3) select week(20001231,2),week(20001231,3); week(20001231,2) week(20001231,3) 1 52 +set default_week_format = 2; +select week(20001231),week(20001231,2),week(20001231,0); +week(20001231) week(20001231,2) week(20001231,0) +1 1 53 +set default_week_format = 0; select date_format('1998-12-31','%x-%v'),date_format('1999-01-01','%x-%v'); date_format('1998-12-31','%x-%v') date_format('1999-01-01','%x-%v') 1998-53 1998-53 diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 903b80eb12a..af222b0b3cc 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -41,6 +41,10 @@ select yearweek("2000-01-06",1) as '2000', yearweek("2001-01-06",1) as '2001', y select week(19981231,2), week(19981231,3), week(20000101,2), week(20000101,3); select week(20001231,2),week(20001231,3); +set default_week_format = 2; +select week(20001231),week(20001231,2),week(20001231,0); +set default_week_format = 0; + select date_format('1998-12-31','%x-%v'),date_format('1999-01-01','%x-%v'); select date_format('1999-12-31','%x-%v'),date_format('2000-01-01','%x-%v'); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1be832964b9..e961e3a8b13 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3465,7 +3465,8 @@ enum options OPT_ERROR_LOG_FILE, OPT_ENABLE_SHARED_MEMORY, OPT_SHARED_MEMORY_BASE_NAME, - OPT_OLD_PASSWORDS + OPT_OLD_PASSWORDS, + OPT_DEFAULT_WEEK_FORMAT }; @@ -4282,6 +4283,11 @@ struct my_option my_long_options[] = (gptr*) &global_system_variables.net_wait_timeout, (gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG, REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0}, + { "default-week-format", OPT_DEFAULT_WEEK_FORMAT, + "The default week format used by WEEK() functions.", + (gptr*) &global_system_variables.default_week_format, + (gptr*) &max_system_variables.default_week_format, + 0, GET_ULONG, REQUIRED_ARG, 0, 0, 3L, 0, 1, 0}, {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; diff --git a/sql/set_var.cc b/sql/set_var.cc index 5686adb765e..0449e048a2f 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -311,6 +311,8 @@ static sys_var_slave_skip_counter sys_slave_skip_counter("sql_slave_skip_counter static sys_var_rand_seed1 sys_rand_seed1("rand_seed1"); static sys_var_rand_seed2 sys_rand_seed2("rand_seed2"); +static sys_var_thd_ulong sys_default_week_format("default_week_format", + &SV::default_week_format); /* List of all variables for initialisation and storage in hash @@ -332,6 +334,7 @@ sys_var *sys_variables[]= &sys_concurrent_insert, &sys_connect_timeout, &sys_convert_charset, + &sys_default_week_format, &sys_delay_key_write, &sys_delayed_insert_limit, &sys_delayed_insert_timeout, @@ -438,6 +441,7 @@ struct show_var_st init_vars[]= { {sys_connect_timeout.name, (char*) &sys_connect_timeout, SHOW_SYS}, {sys_convert_charset.name, (char*) &sys_convert_charset, SHOW_SYS}, {"datadir", mysql_real_data_home, SHOW_CHAR}, + {"default_week_format", (char*) &sys_default_week_format, SHOW_SYS}, {sys_delay_key_write.name, (char*) &sys_delay_key_write, SHOW_SYS}, {sys_delayed_insert_limit.name, (char*) &sys_delayed_insert_limit,SHOW_SYS}, {sys_delayed_insert_timeout.name, (char*) &sys_delayed_insert_timeout, SHOW_SYS}, diff --git a/sql/sql_class.h b/sql/sql_class.h index ccbd7a194f2..4412b190f29 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -391,6 +391,7 @@ struct system_variables ulong tmp_table_size; ulong tx_isolation; ulong sql_mode; + ulong default_week_format; /* In slave thread we need to know in behalf of which diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b9c0167bc05..4fc0f3c878e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2421,7 +2421,10 @@ simple_expr: | USER '(' ')' { $$= new Item_func_user(); Lex->safe_to_cache_query=0; } | WEEK_SYM '(' expr ')' - { $$= new Item_func_week($3,new Item_int((char*) "0",0,1)); } + { + $$= new Item_func_week($3,new Item_int((char*) "0", + YYTHD->variables.default_week_format,1)); + } | WEEK_SYM '(' expr ',' expr ')' { $$= new Item_func_week($3,$5); } | YEAR_SYM '(' expr ')' |