Commit de1499ea authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/my/mysql-5.0


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 3cf92fb7 2226065b

heap/hp_test1.c

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ int main(int argc, char **argv) 
  get_options(argc,argv);



  bzero(&hp_create_info, sizeof(hp_create_info));

  hp_create_info.max_table_size= 1024L*1024L;



  keyinfo[0].keysegs=1;

  keyinfo[0].seg=keyseg;
@@ -58,7 +59,7 @@ int main(int argc, char **argv) 
  bzero((gptr) flags,sizeof(flags));



  printf("- Creating heap-file\n");

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000l,10l,

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,101L,

		  &hp_create_info) ||

      !(file= heap_open(filename, 2)))

    goto err;

heap/hp_test2.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ int main(int argc, char *argv[]) 
  get_options(argc,argv);

  

  bzero(&hp_create_info, sizeof(hp_create_info));

  hp_create_info.max_table_size= 1024L*1024L;



  write_count=update=opt_delete=0;

  key_check=0;

include/my_global.h

+2 −2
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ do { doubleget_union _tmp; \ 
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \

			     *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \

                         } while (0)

#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)

#define float4get(V,M)   do { *((float *) &(V)) = *((float*) (M)); } while(0)

#define float8get(V,M)   doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

#define floatstore(T,V)  memcpy((byte*)(T), (byte*)(&V),sizeof(float))

mysql-test/t/func_time.test

+0 −2
Original line number Diff line number Diff line
@@ -147,8 +147,6 @@ select extract(MONTH FROM "2001-02-00"); 
#

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);



#

# test EXTRACT QUARTER (Bug #18100)

#

mysys/my_handler.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

   MA 02111-1307, USA */



#include <my_global.h>

#include "my_handler.h"



int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,