database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Clean up merge from 4.1

Browse Source 
mysql-test/r/func_date_add.result:
  Update results
mysql-test/r/func_time.result:
  Update results
server-tools/instance-manager/protocol.cc:
  Fix call to list_rest()
sql/sp_head.cc:
  sp_change_db() removed, call mysql_change_db() instead.
This commit is contained in:
unknown
2005-08-15 14:19:56 -07:00
parent d6a6a48861
commit c78623fa10
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/func_date_add.result
View File

@@ -56,10 +56,10 @@ insert into t1 values (date_add('2000-01-04', INTERVAL NULL DAY));
set sql_mode=''; set sql_mode='';
insert into t1 (d) select date_sub('2000-01-01', INTERVAL 2001 YEAR); insert into t1 (d) select date_sub('2000-01-01', INTERVAL 2001 YEAR);
Warnings: Warnings:
Warning 1437 Datetime function: datetime field overflow Warning 1441 Datetime function: datetime field overflow
insert into t1 (d) select date_add('2000-01-01',interval 8000 year); insert into t1 (d) select date_add('2000-01-01',interval 8000 year);
Warnings: Warnings:
Warning 1437 Datetime function: datetime field overflow Warning 1441 Datetime function: datetime field overflow
insert into t1 values (date_add(NULL, INTERVAL 1 DAY)); insert into t1 values (date_add(NULL, INTERVAL 1 DAY));
insert into t1 values (date_add('2000-01-04', INTERVAL NULL DAY)); insert into t1 values (date_add('2000-01-04', INTERVAL NULL DAY));
select * from t1; select * from t1;

14
mysql-test/r/func_time.result
View File

@@ -247,9 +247,13 @@ date_add("1997-12-31 23:59:59",INTERVAL -100000 DAY)
select date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH); select date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH);
date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH) date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH)
NULL NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
select date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR); select date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR);
date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR) date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR)
NULL NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
select date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND); select date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND);
date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND) date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND)
1998-01-07 22:40:00 1998-01-07 22:40:00
@@ -301,6 +305,8 @@ NULL
select date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND); select date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND);
date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND) date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND)
NULL NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
select date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND); select date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND);
date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND) date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND)
NULL NULL
@@ -375,15 +381,23 @@ SELECT "1900-01-01 00:00:00" + INTERVAL 1<<20 HOUR;
SELECT "1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND; SELECT "1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND;
"1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND "1900-01-01 00:00:00" + INTERVAL 1<<38 SECOND
NULL NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
SELECT "1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE; SELECT "1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE;
"1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE "1900-01-01 00:00:00" + INTERVAL 1<<33 MINUTE
NULL NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
SELECT "1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR; SELECT "1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR;
"1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR "1900-01-01 00:00:00" + INTERVAL 1<<30 HOUR
NULL NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
SELECT "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND; SELECT "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND;
"1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND
NULL NULL
Warnings:
Warning 1441 Datetime function: datetime field overflow
create table t1 (ctime varchar(20)); create table t1 (ctime varchar(20));
insert into t1 values ('2001-01-12 12:23:40'); insert into t1 values ('2001-01-12 12:23:40');
select ctime, hour(ctime) from t1; select ctime, hour(ctime) from t1;

2
server-tools/instance-manager/protocol.cc
View File

@@ -203,7 +203,7 @@ int send_fields(struct st_net *net, LIST *fields)
position+= 12; position+= 12;
if (my_net_write(net, send_buff.buffer, (uint) position+1)) if (my_net_write(net, send_buff.buffer, (uint) position+1))
goto err; goto err;
tmp= rest(tmp); tmp= list_rest(tmp);
} }
if (my_net_write(net, eof_buff, 1)) if (my_net_write(net, eof_buff, 1))

2
sql/sp_head.cc
View File

@@ -737,7 +737,7 @@ sp_head::execute(THD *thd)
if (dbchanged) if (dbchanged)
{ {
if (! thd->killed) if (! thd->killed)
ret= sp_change_db(thd, olddb, 0); ret= mysql_change_db(thd, olddb, 0);
} }
m_is_invoked= FALSE; m_is_invoked= FALSE;
DBUG_RETURN(ret); DBUG_RETURN(ret);