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

Fixes up things after merge from 3.23.44

Browse Source 
Portability fixes.
Don't delete temporary tables on FLUSH tables.


client/client_priv.h:
  Fix after merge
client/mysqldump.c:
  Fix after merge
include/my_global.h:
  Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
  Added missing prototype
myisam/ft_boolean_search.c:
  Removed warnings
myisam/ft_nlq_search.c:
  Removed warnings
myisam/mi_search.c:
  CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
  Write all logs to log directory
mysql-test/r/func_time.result:
  Fix test results after merge
mysql-test/r/having.result:
  Fix test results after merge
mysql-test/r/join.result:
  Fix test results after merge
mysql-test/r/rpl000012.result:
  Fix test results after merge
mysys/mf_iocache.c:
  Allow multiple call to end_iocache.
sql/ha_innobase.cc:
  Removed possible problem with using uninitialized variable
sql/log_event.cc:
  Don't delete temporary tables on FLUSH tables.
  (Needs to be fixed properly)
This commit is contained in:
unknown
2001-11-05 01:04:08 +02:00
parent cec36f0f14
commit d18a6cc33a
15 changed files with 142 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,9 @@ select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"),
sec_to_time(time_to_sec("0:30:47")/6.21);
sec_to_time(9001) sec_to_time(9001)+0 time_to_sec("15:12:22") sec_to_time(time_to_sec("0:30:47")/6.21)
02:30:01 23001 54742 00:04:57
select sec_to_time(time_to_sec('-838:59:59'));
sec_to_time(time_to_sec('-838:59:59'))
-838:59:59
select now()-curdate()*1000000-curtime();
now()-curdate()*1000000-curtime()
0
@ -339,3 +342,33 @@ SELECT year(updated) from t1;
year(updated)
NULL
drop table t1;
create table t1 (d date, dt datetime, t timestamp, c char(10));
insert into t1 values ("0000-00-00", "0000-00-00", "0000-00-00", "0000-00-00");
select dayofyear("0000-00-00"),dayofyear(d),dayofyear(dt),dayofyear(t),dayofyear(c) from t1;
dayofyear("0000-00-00") dayofyear(d) dayofyear(dt) dayofyear(t) dayofyear(c)
NULL NULL NULL NULL NULL
select dayofmonth("0000-00-00"),dayofmonth(d),dayofmonth(dt),dayofmonth(t),dayofmonth(c) from t1;
dayofmonth("0000-00-00") dayofmonth(d) dayofmonth(dt) dayofmonth(t) dayofmonth(c)
0 0 0 0 0
select month("0000-00-00"),month(d),month(dt),month(t),month(c) from t1;
month("0000-00-00") month(d) month(dt) month(t) month(c)
0 0 0 0 0
select quarter("0000-00-00"),quarter(d),quarter(dt),quarter(t),quarter(c) from t1;
quarter("0000-00-00") quarter(d) quarter(dt) quarter(t) quarter(c)
0 0 0 0 0
select week("0000-00-00"),week(d),week(dt),week(t),week(c) from t1;
week("0000-00-00") week(d) week(dt) week(t) week(c)
NULL NULL NULL NULL NULL
select year("0000-00-00"),year(d),year(dt),year(t),year(c) from t1;
year("0000-00-00") year(d) year(dt) year(t) year(c)
0 0 0 0 0
select yearweek("0000-00-00"),yearweek(d),yearweek(dt),yearweek(t),yearweek(c) from t1;
yearweek("0000-00-00") yearweek(d) yearweek(dt) yearweek(t) yearweek(c)
NULL NULL NULL NULL NULL
select to_days("0000-00-00"),to_days(d),to_days(dt),to_days(t),to_days(c) from t1;
to_days("0000-00-00") to_days(d) to_days(dt) to_days(t) to_days(c)
NULL NULL NULL NULL NULL
select extract(MONTH FROM "0000-00-00"),extract(MONTH FROM d),extract(MONTH FROM dt),extract(MONTH FROM t),extract(MONTH FROM c) from t1;
extract(MONTH FROM "0000-00-00") extract(MONTH FROM d) extract(MONTH FROM dt) extract(MONTH FROM t) extract(MONTH FROM c)
0 0 0 0 0
drop table t1;