Commit 8023bda5 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1
parents 133ea93b 5a9dc44d

myisam/mi_check.c

+4 −3
Original line number Diff line number Diff line
@@ -1838,8 +1838,9 @@ static int sort_one_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo, 
	_mi_kpointer(info,keypos-nod_flag,param->new_file_pos); /* Save new pos */

	if (sort_one_index(param,info,keyinfo,next_page,new_file))

	{

	  DBUG_PRINT("error",("From page: %ld, keyoffset: %d  used_length: %d",

			      (ulong) pagepos, (int) (keypos - buff),

	  DBUG_PRINT("error",

		     ("From page: %ld, keyoffset: 0x%lx  used_length: %d",

		      (ulong) pagepos, (ulong) (keypos - buff),

		      (int) used_length));

	  DBUG_DUMP("buff",(byte*) buff,used_length);

	  goto err;

myisam/mi_delete.c

+4 −2
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key, 
  MYISAM_SHARE *share=info->s;

  MI_KEY_PARAM s_temp;

  DBUG_ENTER("del");

  DBUG_PRINT("enter",("leaf_page: %ld   keypos: %lx",leaf_page,keypos));

  DBUG_PRINT("enter",("leaf_page: %ld  keypos: 0x%lx", leaf_page,

		      (ulong) keypos));

  DBUG_DUMP("leaf_buff",(byte*) leaf_buff,mi_getint(leaf_buff));



  endpos=leaf_buff+mi_getint(leaf_buff);
@@ -495,7 +496,8 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo, 
  MI_KEY_PARAM s_temp;

  MYISAM_SHARE *share=info->s;

  DBUG_ENTER("underflow");

  DBUG_PRINT("enter",("leaf_page: %ld   keypos: %lx",(long) leaf_page,keypos));

  DBUG_PRINT("enter",("leaf_page: %ld  keypos: 0x%lx",(long) leaf_page,

		      (ulong) keypos));

  DBUG_DUMP("anc_buff",(byte*) anc_buff,mi_getint(anc_buff));

  DBUG_DUMP("leaf_buff",(byte*) leaf_buff,mi_getint(leaf_buff));

mysql-test/r/date_formats.result

+8 −0
Original line number Diff line number Diff line
@@ -456,3 +456,11 @@ f1 f2 
Warnings:

Warning	1292	Truncated incorrect date value: '2003-04-05  g'

Warning	1292	Truncated incorrect datetime value: '2003-04-05 10:11:12.101010234567'

create table t1 (f1 datetime);

insert into t1 (f1) values ("2005-01-01");

insert into t1 (f1) values ("2005-02-01");

select date_format(f1, "%m") as d1, date_format(f1, "%M") as d2 from t1 order by date_format(f1, "%M");

d1	d2

02	February

01	January

drop table t1;

mysql-test/r/insert_select.result

+8 −0
Original line number Diff line number Diff line
@@ -678,3 +678,11 @@ f1 
2001

2002

drop table t1;

create table t1(x int, y int);

create table t2(x int, z int);

insert into t1(x,y) select x,z from t2 on duplicate key update x=values(x);

insert into t1(x,y) select x,z from t2 on duplicate key update x=values(z);

ERROR 42S22: Unknown column 'z' in 'field list'

insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x);

ERROR 42S02: Unknown table 't2' in field list

drop table t1,t2;

mysql-test/t/date_formats.test

+8 −0
Original line number Diff line number Diff line
@@ -260,4 +260,12 @@ select str_to_date("2003-04-05 g", "%Y-%m-%d") as f1, 
       str_to_date("2003-04-05 10:11:12.101010234567", "%Y-%m-%d %H:%i:%S.%f") as f2;

--enable_ps_protocol



#

# Bug #14016 

#

create table t1 (f1 datetime);

insert into t1 (f1) values ("2005-01-01");

insert into t1 (f1) values ("2005-02-01");

select date_format(f1, "%m") as d1, date_format(f1, "%M") as d2 from t1 order by date_format(f1, "%M");

drop table t1;

# End of 4.1 tests