database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge with 3.23 to get patch for floor()

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown
2004-03-12 01:12:14 +02:00
parent a1d9e1eec4 bc9de3d455
commit dd8b25510e
5 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysql/libmysql.c
View File

@ -2112,8 +2112,8 @@ static my_bool mysql_reconnect(MYSQL *mysql)
{ {
/* Allow reconnect next time */ /* Allow reconnect next time */
mysql->server_status&= ~SERVER_STATUS_IN_TRANS; mysql->server_status&= ~SERVER_STATUS_IN_TRANS;
mysql->net.last_errno=CR_SERVER_GONE_ERROR; mysql->net.last_errno= CR_SERVER_GONE_ERROR;
strmov(mysql->net.last_error,ER(mysql->net.last_errno)); strmov(mysql->net.last_error, ER(mysql->net.last_errno));
DBUG_RETURN(1); DBUG_RETURN(1);
} }
mysql_init(&tmp_mysql); mysql_init(&tmp_mysql);

4
myisam/mi_check.c
View File

@ -112,7 +112,9 @@ int chk_status(MI_CHECK *param, register MI_INFO *info)
/* Don't count this as a real warning, as check can correct this ! */ /* Don't count this as a real warning, as check can correct this ! */
uint save=param->warning_printed; uint save=param->warning_printed;
mi_check_print_warning(param, mi_check_print_warning(param,
"%d clients is using or hasn't closed the table properly", share->state.open_count==1 ?
"%d client is using or hasn't closed the table properly" :
"%d clients are using or haven't closed the table properly",
share->state.open_count); share->state.open_count);
/* If this will be fixed by the check, forget the warning */ /* If this will be fixed by the check, forget the warning */
if (param->testflag & T_UPDATE_STATE) if (param->testflag & T_UPDATE_STATE)

6
mysql-test/r/func_math.result
View File

@ -59,3 +59,9 @@ ASIN(0.8+0.2)
SELECT ASIN(1.2-0.2); SELECT ASIN(1.2-0.2);
ASIN(1.2-0.2) ASIN(1.2-0.2)
1.570796 1.570796
floor(log(4)/log(2))
2
floor(log(8)/log(2))
3
floor(log(16)/log(2))
4

8
mysql-test/t/func_math.test
View File

@ -28,3 +28,11 @@ SELECT ACOS(0.2*5.0);
SELECT ACOS(0.5*2.0); SELECT ACOS(0.5*2.0);
SELECT ASIN(0.8+0.2); SELECT ASIN(0.8+0.2);
SELECT ASIN(1.2-0.2); SELECT ASIN(1.2-0.2);
#
# Bug #3051 FLOOR returns invalid
#
select floor(log(4)/log(2));
select floor(log(8)/log(2));
select floor(log(16)/log(2));

3
sql/item_func.cc
View File

@ -667,7 +667,8 @@ longlong Item_func_ceiling::val_int()
longlong Item_func_floor::val_int() longlong Item_func_floor::val_int()
{ {
double value=args[0]->val(); // the volatile's for BUG #3051 to calm optimizer down (because of gcc's bug)
volatile double value=args[0]->val();
null_value=args[0]->null_value; null_value=args[0]->null_value;
return (longlong) floor(value); return (longlong) floor(value);
} }