Commit 0c0a5097 authored by unknown's avatar unknown
Browse files

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

into rurik.mysql.com:/home/igor/mysql-5.0
parents b80eb2b5 a6023312

mysql-test/r/func_str.result

+11 −0
Original line number Diff line number Diff line
@@ -800,3 +800,14 @@ field(0,NULL,1,0) field("",NULL,"bar","") field(0.0,NULL,1.0,0.0) 
select field(NULL,1,2,NULL), field(NULL,1,2,0);

field(NULL,1,2,NULL)	field(NULL,1,2,0)

0	0

CREATE TABLE t1 (str varchar(20) PRIMARY KEY);

CREATE TABLE t2 (num int primary key);

INSERT INTO t1 VALUES ('notnumber');

INSERT INTO t2 VALUES (0), (1);

SELECT * FROM t1, t2 WHERE num=str;

str	num

notnumber	0

SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6);

str	num

notnumber	0

DROP TABLE t1,t2;

mysql-test/t/func_str.test

+14 −0
Original line number Diff line number Diff line
@@ -529,3 +529,17 @@ DROP TABLE t1, t2; 
#

select field(0,NULL,1,0), field("",NULL,"bar",""), field(0.0,NULL,1.0,0.0);

select field(NULL,1,2,NULL), field(NULL,1,2,0);



#

# Bug #10124: access by integer index with a string key that is not a number  

#



CREATE TABLE t1 (str varchar(20) PRIMARY KEY);

CREATE TABLE t2 (num int primary key);

INSERT INTO t1 VALUES ('notnumber');

INSERT INTO t2 VALUES (0), (1); 



SELECT * FROM t1, t2 WHERE num=str;

SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6);



DROP TABLE t1,t2;

sql/field.cc

+17 −13
Original line number Diff line number Diff line
@@ -3317,12 +3317,12 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs) 
  }

  if (error)

  {

    error= 1;

    error= error != MY_ERRNO_EDOM ? 1 : 2;

    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);

  }

  else if (from+len != end && table->in_use->count_cuted_fields &&

           check_int(from,len,end,cs))

    error= 1;

    error= 2;

    

  store_tmp= (long) tmp;

#ifdef WORDS_BIGENDIAN
@@ -3584,7 +3584,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs) 
  }

  else if (from+len != end && table->in_use->count_cuted_fields &&

           check_int(from,len,end,cs))

    error= 1;

    error= 2;

#ifdef WORDS_BIGENDIAN

  if (table->s->db_low_byte_first)

  {
@@ -3806,7 +3806,7 @@ int Field_float::store(const char *from,uint len,CHARSET_INFO *cs) 
  {

    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,

                (error ? ER_WARN_DATA_OUT_OF_RANGE : WARN_DATA_TRUNCATED), 1);

    error= 1;

    error= error ? 1 : 2;

  }

  Field_float::store(nr);

  return error;
@@ -4093,7 +4093,7 @@ int Field_double::store(const char *from,uint len,CHARSET_INFO *cs) 
  {

    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,

                (error ? ER_WARN_DATA_OUT_OF_RANGE : WARN_DATA_TRUNCATED), 1);

    error= 1;

    error= error ? 1 : 2;

  }

  Field_double::store(nr);

  return error;
@@ -4495,6 +4495,8 @@ int Field_timestamp::store(const char *from,uint len,CHARSET_INFO *cs) 
      error= 1;

    }

  }

  if (error > 1)

    error= 2;



#ifdef WORDS_BIGENDIAN

  if (table->s->db_low_byte_first)
@@ -4791,7 +4793,7 @@ int Field_time::store(const char *from,uint len,CHARSET_INFO *cs) 
  if (str_to_time(from, len, &ltime, &error))

  {

    tmp=0L;

    error= 1;

    error= 2;

    set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,

                         from, len, MYSQL_TIMESTAMP_TIME, 1);

  }
@@ -4813,6 +4815,8 @@ int Field_time::store(const char *from,uint len,CHARSET_INFO *cs) 
                           from, len, MYSQL_TIMESTAMP_TIME, !error);

      error= 1;

    }

    if (error > 1)

      error= 2;

  }

  

  if (ltime.neg)
@@ -5149,7 +5153,7 @@ int Field_date::store(const char *from, uint len,CHARSET_INFO *cs) 
                      &error) <= MYSQL_TIMESTAMP_ERROR)

  {

    tmp=0;

    error= 1;

    error= 2;

  }

  else

    tmp=(uint32) l_time.year*10000L + (uint32) (l_time.month*100+l_time.day);
@@ -5353,7 +5357,7 @@ int Field_newdate::store(const char *from,uint len,CHARSET_INFO *cs) 
                      &error) <= MYSQL_TIMESTAMP_ERROR)

  {

    tmp=0L;

    error= 1;

    error= 2;

  }

  else

    tmp= l_time.day + l_time.month*32 + l_time.year*16*32;
@@ -5836,7 +5840,7 @@ int Field_string::store(const char *from,uint length,CHARSET_INFO *cs) 
    from= tmpstr.ptr();

    length=  tmpstr.length();

    if (conv_errors)

      error= 1;

      error= 2;

  }



  /*
@@ -5860,7 +5864,7 @@ int Field_string::store(const char *from,uint length,CHARSET_INFO *cs) 
    from+= field_charset->cset->scan(field_charset, from, end,

				     MY_SEQ_SPACES);

    if (from != end)

      error= 1;

      error= 2;

  }

  if (error)

  {
@@ -6242,7 +6246,7 @@ int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs) 
        table->in_use->abort_on_warning)

      error_code= ER_DATA_TOO_LONG;

    set_warning(level, error_code, 1);

    return 1;

    return 2;

  }

  return 0;

}
@@ -6822,7 +6826,7 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs) 
      from= tmpstr.ptr();

      length=  tmpstr.length();

      if (conv_errors)

        error= 1;

        error= 2;

    }

    

    copy_length= max_data_length();
@@ -6837,7 +6841,7 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs) 
                                                      copy_length,

                                                      &well_formed_error);

    if (copy_length < length)

      error= 1;

      error= 2;

    Field_blob::store_length(copy_length);

    if (was_conversion || table->copy_blobs || copy_length <= MAX_FIELD_WIDTH)

    {						// Must make a copy

sql/item_subselect.cc

+2 −2
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ int subselect_uniquesubquery_engine::exec() 
  TABLE *table= tab->table;

  for (store_key **copy=tab->ref.key_copy ; *copy ; copy++)

  {

    if (tab->ref.key_err= (*copy)->copy())

    if ((tab->ref.key_err= (*copy)->copy()) & 1)

    {

      table->status= STATUS_NOT_FOUND;

      DBUG_RETURN(1);
@@ -1540,7 +1540,7 @@ int subselect_indexsubquery_engine::exec() 


  for (store_key **copy=tab->ref.key_copy ; *copy ; copy++)

  {

    if (tab->ref.key_err= (*copy)->copy())

    if ((tab->ref.key_err= (*copy)->copy()) & 1)

    {

      table->status= STATUS_NOT_FOUND;

      DBUG_RETURN(1);

sql/sql_parse.cc

+0 −1
Original line number Diff line number Diff line
@@ -3272,7 +3272,6 @@ mysql_execute_command(THD *thd) 


    if (first_table->view && !first_table->contain_auto_increment)

      thd->last_insert_id= 0; // do not show last insert ID if VIEW have not it



    break;

  }

  case SQLCOM_TRUNCATE: