Commit a4c18f97 authored by unknown's avatar unknown
Browse files

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

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
parents 2197ee52 c9a09e12

mysql-test/r/select.result

+4 −0
Original line number Diff line number Diff line
@@ -2057,6 +2057,10 @@ t2 1 fld3 1 fld3 A NULL NULL NULL BTREE 
drop table t4, t3, t2, t1;

DO 1;

DO benchmark(100,1+1),1,1;

do default;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

do foobar;

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

CREATE TABLE t1 (

id mediumint(8) unsigned NOT NULL auto_increment,

pseudo varchar(35) NOT NULL default '',

mysql-test/t/select.test

+9 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,15 @@ drop table t4, t3, t2, t1; 
DO 1;

DO benchmark(100,1+1),1,1;



#

# Bug #6449: do default;

#



--error 1064

do default;

--error 1054

do foobar;



#

# random in WHERE clause

#

sql/sql_yacc.yy

+5 −4
Original line number Diff line number Diff line
@@ -3932,11 +3932,12 @@ do: DO_SYM 
	{

	  LEX *lex=Lex;

	  lex->sql_command = SQLCOM_DO;

	  if (!(lex->insert_list = new List_item))

	    YYABORT;

	  mysql_init_select(lex);

	}

	expr_list

	{

	  Lex->insert_list= $3;

	}

	values

	{}

	;



/*

strings/ctype-tis620.c

+2 −2
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)), 


  tc1= buf;

  if ((len1 + len2 +2) > (int) sizeof(buf))

    tc1= (uchar*) malloc(len1+len2);

    tc1= (uchar*) malloc(len1+len2+2);

  tc2= tc1 + len1+1;

  memcpy((char*) tc1, (char*) s1, len1);

  tc1[len1]= 0;		/* if length(s1)> len1, need to put 'end of string' */
@@ -568,7 +568,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)), 
  

  a= buf;

  if ((a_length + b_length +2) > (int) sizeof(buf))

    alloced= a= (uchar*) malloc(a_length+b_length);

    alloced= a= (uchar*) malloc(a_length+b_length+2);

  

  b= a + a_length+1;

  memcpy((char*) a, (char*) a0, a_length);

sql/ha_ndbcluster.cc

+1 −1

File changed.

Contains only whitespace changes.