Commit b63d9439 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents d3f5dfbd 26c1d47a

mysql-test/r/ps_7ndb.result

+9 −9
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ def test t9 t9 c18 c18 1 4 1 Y 32768 0 63 
def	test	t9	t9	c19	c19	1	1	1	Y	32768	0	63

def	test	t9	t9	c20	c20	254	1	1	Y	0	0	8

def	test	t9	t9	c21	c21	254	10	10	Y	0	0	8

def	test	t9	t9	c22	c22	254	30	30	Y	0	0	8

def	test	t9	t9	c22	c22	253	30	30	Y	0	0	8

def	test	t9	t9	c23	c23	252	255	8	Y	144	0	63

def	test	t9	t9	c24	c24	252	255	8	Y	16	0	8

def	test	t9	t9	c25	c25	252	65535	4	Y	144	0	63
@@ -1926,7 +1926,7 @@ def @arg28 253 8192 10 Y 0 31 8 
def					@arg29	253	8192	8	Y	128	31	63

def					@arg30	253	8192	8	Y	0	31	8

def					@arg31	253	8192	3	Y	0	31	8

def					@arg32	253	8192	6	Y	128	31	63

def					@arg32	253	8192	6	Y	0	31	8

@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32

1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday

select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -2023,7 +2023,7 @@ def @arg28 253 8192 10 Y 0 31 8 
def					@arg29	253	8192	8	Y	128	31	63

def					@arg30	253	8192	8	Y	0	31	8

def					@arg31	253	8192	3	Y	0	31	8

def					@arg32	253	8192	6	Y	128	31	63

def					@arg32	253	8192	6	Y	0	31	8

@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32

1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday

set @my_key= 0 ;
@@ -2111,7 +2111,7 @@ def @arg28 253 8192 10 Y 0 31 8 
def					@arg29	253	8192	8	Y	128	31	63

def					@arg30	253	8192	8	Y	0	31	8

def					@arg31	253	8192	3	Y	0	31	8

def					@arg32	253	8192	6	Y	128	31	63

def					@arg32	253	8192	6	Y	0	31	8

@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32

1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday

select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2201,7 +2201,7 @@ def @arg28 253 8192 10 Y 0 31 8 
def					@arg29	253	8192	8	Y	128	31	63

def					@arg30	253	8192	8	Y	0	31	8

def					@arg31	253	8192	3	Y	0	31	8

def					@arg32	253	8192	6	Y	128	31	63

def					@arg32	253	8192	6	Y	0	31	8

@arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32

1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday

set @my_key= 0 ;

sql/sql_insert.cc

+5 −5
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, 
  error=0;

  id=0;

  thd->proc_info="update";

  if (duplic != DUP_ERROR)

  if (duplic != DUP_ERROR || ignore)

    table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

  /*

    let's *try* to start bulk inserts. It won't necessary
@@ -471,7 +471,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, 
  table->next_number_field=0;

  thd->count_cuted_fields= CHECK_FIELD_IGNORE;

  thd->next_insert_id=0;			// Reset this if wrongly used

  if (duplic != DUP_ERROR)

  if (duplic != DUP_ERROR || ignore)

    table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);



  /* Reset value of LAST_INSERT_ID if no rows where inserted */
@@ -1606,7 +1606,7 @@ bool delayed_insert::handle_inserts(void) 
    info.ignore= row->ignore;

    info.handle_duplicates= row->dup;

    if (info.ignore ||

	info.handle_duplicates == DUP_REPLACE)

	info.handle_duplicates != DUP_ERROR)

    {

      table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

      using_ignore=1;
@@ -1806,7 +1806,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 
  restore_record(table,s->default_values);		// Get empty record

  table->next_number_field=table->found_next_number_field;

  thd->cuted_fields=0;

  if (info.ignore || info.handle_duplicates == DUP_REPLACE)

  if (info.ignore || info.handle_duplicates != DUP_ERROR)

    table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

  table->file->start_bulk_insert((ha_rows) 0);

  thd->no_trans_update= 0;
@@ -2008,7 +2008,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 


  restore_record(table,s->default_values);      // Get empty record

  thd->cuted_fields=0;

  if (info.ignore || info.handle_duplicates == DUP_REPLACE)

  if (info.ignore || info.handle_duplicates != DUP_ERROR)

    table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

  table->file->start_bulk_insert((ha_rows) 0);

  thd->no_trans_update= 0;