Commit 7f113e91 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Merge
storage/ndb/src/common/util/InputStream.cpp:
  Merge
parents da7016ee 96fa010c

mysql-test/r/type_varchar.result

+1 −0
Original line number Diff line number Diff line
@@ -488,3 +488,4 @@ t 0 
Warnings:

Warning	1292	Truncated incorrect INTEGER value: '1a'

Warning	1292	Truncated incorrect INTEGER value: 't'

DROP TABLE t1;

mysql-test/t/type_varchar.test

+1 −0
Original line number Diff line number Diff line
@@ -196,3 +196,4 @@ INSERT INTO t1 VALUES (10), (50), (30), ('1a'), (60), ('t'); 
SELECT a,(a + 0) FROM t1 ORDER BY a;

SELECT a,(a DIV 2) FROM t1 ORDER BY a;

SELECT a,CAST(a AS SIGNED) FROM t1 ORDER BY a;

DROP TABLE t1;

sql/item_func.cc

+14 −5
Original line number Diff line number Diff line
@@ -897,7 +897,8 @@ void Item_func_signed::print(String *str) 


longlong Item_func_signed::val_int_from_str(int *error)

{

  char buff[MAX_FIELD_WIDTH], *end;

  char buff[MAX_FIELD_WIDTH], *end, *start;

  uint32 length;

  String tmp(buff,sizeof(buff), &my_charset_bin), *res;

  longlong value;
@@ -913,13 +914,21 @@ longlong Item_func_signed::val_int_from_str(int *error) 
    return 0;

  }

  null_value= 0;

  end= (char*) res->ptr()+ res->length();

  value= my_strtoll10(res->ptr(), &end, error);

  if (*error > 0 || end != res->ptr()+ res->length())

  start= (char *)res->ptr();

  length= res->length();



  end= start + length;

  value= my_strtoll10(start, &end, error);

  if (*error > 0 || end != start+ length)

  {

    char err_buff[128];

    String err_tmp(err_buff,(uint32) sizeof(err_buff), system_charset_info);

    err_tmp.copy(start, length, system_charset_info);

    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,

                        ER_TRUNCATED_WRONG_VALUE,

                        ER(ER_TRUNCATED_WRONG_VALUE), "INTEGER",

                        res->c_ptr());

                        err_tmp.c_ptr());

  }

  return value;

}

storage/ndb/tools/ndb_condig.cpp

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static int g_verbose = 0; 
static int try_reconnect = 3;



static int g_nodes, g_connections, g_section;

static const char * g_connectstring = 0;

static const char * g_query = 0;



static int g_nodeid = 0;
@@ -486,7 +485,7 @@ fetch_configuration() 


  ndb_mgm_set_error_stream(mgm, stderr);

  

  if (ndb_mgm_set_connectstring(mgm, g_connectstring))

  if (ndb_mgm_set_connectstring(mgm, opt_connect_str))

  {

    fprintf(stderr, "* %5d: %s\n", 

	    ndb_mgm_get_latest_error(mgm),

storage/ndb/src/common/util/File.cpp

+1 −1

File changed.

Contains only whitespace changes.