bk commit into 5.0 tree (ramil:1.1943) BUG#11153

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1943 05/06/08 11:37:43 ramil@stripped +2 -0
  A fix (bug #11153: Ambiguous call to overloaded function, acording to Visual Studio 6)

  sql/sql_yacc.yy
    1.393 05/06/08 11:37:33 ramil@stripped +1 -1
    A fix (bug #11153: Ambiguous call to overloaded function, acording to Visual Studio 6)

  sql/item_subselect.cc
    1.109 05/06/08 11:37:33 ramil@stripped +1 -1
    A fix (bug #11153: Ambiguous call to overloaded function, acording to Visual Studio 6)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-5.0-release

--- 1.392/sql/sql_yacc.yy	2005-06-07 19:47:07 +05:00
+++ 1.393/sql/sql_yacc.yy	2005-06-08 11:37:33 +05:00
@@ -7985,7 +7985,7 @@
 	  LEX *lex=Lex;
 	  lex->sql_command = SQLCOM_HA_READ;
 	  lex->ha_rkey_mode= HA_READ_KEY_EXACT;	/* Avoid purify warnings */
-	  lex->current_select->select_limit= new Item_int(1);
+	  lex->current_select->select_limit= new Item_int((int32) 1);
 	  lex->current_select->offset_limit= 0;
 	  if (!lex->current_select->add_table_to_list(lex->thd, $2, 0, 0))
 	    YYABORT;

--- 1.108/sql/item_subselect.cc	2005-06-07 15:13:53 +05:00
+++ 1.109/sql/item_subselect.cc	2005-06-08 11:37:33 +05:00
@@ -601,7 +601,7 @@
    max_length= 1;
    max_columns= engine->cols();
   /* We need only 1 row to determine existence */
-  unit->global_parameters->select_limit= new Item_int(1);
+  unit->global_parameters->select_limit= new Item_int((int32) 1);
 }
 
 double Item_exists_subselect::val_real()