Commit ddd55d43 authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/tmp_merge 

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


VC++Files/client/mysql.dsp:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
parents 8e418820 5efb70d7

VC++Files/client/mysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

VC++Files/client/mysql_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

mysql-test/r/func_time.result

+8 −4
Original line number Diff line number Diff line
@@ -7,20 +7,20 @@ period_add("9602",-12) period_diff(199505,"9404") 
199502	13

select now()-now(),weekday(curdate())-weekday(now()),unix_timestamp()-unix_timestamp(now());

now()-now()	weekday(curdate())-weekday(now())	unix_timestamp()-unix_timestamp(now())

0	0	0

0.000000	0	0

select from_unixtime(unix_timestamp("1994-03-02 10:11:12")),from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s"),from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0;

from_unixtime(unix_timestamp("1994-03-02 10:11:12"))	from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s")	from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0

1994-03-02 10:11:12	1994-03-02 10:11:12	19940302101112

1994-03-02 10:11:12	1994-03-02 10:11:12	19940302101112.000000

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

02:30:01	23001.000000	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

0.000000

select strcmp(current_timestamp(),concat(current_date()," ",current_time()));

strcmp(current_timestamp(),concat(current_date()," ",current_time()))

0
@@ -751,6 +751,10 @@ select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')), 
monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));

monthname(str_to_date(null, '%m'))	monthname(str_to_date(null, '%m'))	monthname(str_to_date(1, '%m'))	monthname(str_to_date(0, '%m'))

NULL	NULL	January	NULL

select now() - now() + 0, curtime() - curtime() + 0, 

sec_to_time(1) + 0, from_unixtime(1) + 0;

now() - now() + 0	curtime() - curtime() + 0	sec_to_time(1) + 0	from_unixtime(1) + 0

0.000000	0.000000	1.000000	19700101030001.000000

explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,

timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

mysql-test/t/func_time.test

+7 −0
Original line number Diff line number Diff line
@@ -367,6 +367,13 @@ select last_day('2005-01-00'); 
select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),

       monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));



#

# Bug #16546

# 



select now() - now() + 0, curtime() - curtime() + 0, 

       sec_to_time(1) + 0, from_unixtime(1) + 0;



# End of 4.1 tests



explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,

ndb/src/ndbapi/NdbDictionaryImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2267,7 +2267,7 @@ NdbDictionaryImpl::dropIndex(const char * indexName, 
    m_error.code = 4243;

    return -1;

  }

  int ret = dropIndex(*idx); //, tableName);

  int ret = dropIndex(*idx);

  // If index stored in cache is incompatible with the one in the kernel

  // we must clear the cache and try again

  if (ret == INCOMPATIBLE_VERSION) {