Commit 792ad914 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents cd9fd11f d6d786a0

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ 
44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

4513d8e4Af4dQWuk13sArwofRgFDQw

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

client/mysqltest.c

+9 −3
Original line number Diff line number Diff line
@@ -1609,7 +1609,10 @@ int do_save_master_pos() 
int do_let(struct st_query *query)

{

  char *p= query->first_argument;

  char *var_name, *var_name_end, *var_val_start;

  char *var_name, *var_name_end;

  DYNAMIC_STRING let_rhs_expr;



  init_dynamic_string(&let_rhs_expr, "", 512, 2048);



  /* Find <var_name> */

  if (!*p)
@@ -1628,10 +1631,13 @@ int do_let(struct st_query *query) 
  /* Find start of <var_val> */

  while (*p && my_isspace(charset_info,*p))

    p++;

  var_val_start= p;



  do_eval(&let_rhs_expr, p, FALSE);



  query->last_argument= query->end;

  /* Assign var_val to var_name */

  return var_set(var_name, var_name_end, var_val_start, query->end);

  return var_set(var_name, var_name_end, let_rhs_expr.str, 

                 (let_rhs_expr.str + let_rhs_expr.length));

}

innobase/srv/srv0start.c

+1 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ innobase_start_or_create_for_mysql(void) 
	maximum number of threads that can wait in the 'srv_conc array' for

	their time to enter InnoDB. */



#if defined(__WIN__) || defined(__NETWARE__)

#if defined(__NETWARE__)



/* Create less event semaphores because Win 98/ME had difficulty creating

40000 event semaphores.

mysql-test/r/execution_constants.result

0 → 100644
+12 −0
Original line number Diff line number Diff line 
CREATE TABLE `t_bug21476` (

`ID_BOARD` smallint(5) unsigned NOT NULL default '0',

`ID_MEMBER` mediumint(8) unsigned NOT NULL default '0',

`logTime` int(10) unsigned NOT NULL default '0',

`ID_MSG` mediumint(8) unsigned NOT NULL default '0',

PRIMARY KEY  (`ID_MEMBER`,`ID_BOARD`),

KEY `logTime` (`logTime`)

) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_bulgarian_ci;

INSERT INTO `t_bug21476` VALUES (2,2,1154870939,0),(1,2,1154870957,0),(2,183,1154941362,0),(2,84,1154904301,0),(1,84,1154905867,0),(2,13,1154947484,10271),(3,84,1154880549,0),(1,6,1154892183,0),(2,25,1154947581,10271),(3,25,1154904760,0),(1,25,1154947373,10271),(1,179,1154899992,0),(2,179,1154899410,0),(5,25,1154901666,0),(2,329,1154902026,0),(3,329,1154902040,0),(1,329,1154902058,0),(1,13,1154930841,0),(3,85,1154904987,0),(1,183,1154929665,0),(3,13,1154931268,0),(1,85,1154936888,0),(1,169,1154937959,0),(2,169,1154941717,0),(3,183,1154939810,0),(3,169,1154941734,0);

Assertion: mysql_errno 1436 == 1436

DROP TABLE `t_bug21476`;

End of 5.0 tests.

mysql-test/r/mysqltest.result

+4 −1
Original line number Diff line number Diff line
@@ -217,8 +217,11 @@ hej 


a long variable content

a long variable content

a long $where variable content

a long a long variable content variable content

a long \$where variable content



banana = banana

Not a banana: ba\$cat\$cat

mysqltest: At line 1: Missing arguments to let

mysqltest: At line 1: Missing variable name in let

mysqltest: At line 1: Variable name in hi=hi does not start with '$'