Commit 64530251 authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

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

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
parents ca95af01 173c2bb0

mysql-test/r/ctype_ucs.result

+8 −0
Original line number Diff line number Diff line
@@ -803,6 +803,14 @@ quote(name) 
????????

????????????????

drop table bug20536;

set names ucs2;

ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'

set names ucs2 collate ucs2_bin;

ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'

set character_set_client= ucs2;

ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'

set character_set_client= concat('ucs', substr('2', 1));

ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'

CREATE TABLE t1(a TEXT CHARSET ucs2 COLLATE ucs2_unicode_ci);

INSERT INTO t1 VALUES('abcd');

SELECT * FROM t1 WHERE MATCH(a) AGAINST ('+abcd' IN BOOLEAN MODE);

mysql-test/r/ps.result

+5 −0
Original line number Diff line number Diff line
@@ -1109,4 +1109,9 @@ a 
13

DEALLOCATE PREPARE st1;

DROP TABLE t1;

create table t1 (a int, b tinyint);

prepare st1 from 'update t1 set b= (str_to_date(a, a))';

execute st1;

deallocate prepare st1;

drop table t1;

End of 4.1 tests.

mysql-test/t/ctype_ucs.test

+12 −0
Original line number Diff line number Diff line
@@ -535,6 +535,18 @@ select quote(name) from bug20536; 


drop table bug20536;



#

# Bug #31615: crash after set names ucs2 collate xxx

#

--error 1231

set names ucs2;

--error 1231

set names ucs2 collate ucs2_bin;

--error 1231

set character_set_client= ucs2;

--error 1231

set character_set_client= concat('ucs', substr('2', 1));



#

# BUG#31159 - fulltext search on ucs2 column crashes server

#

mysql-test/t/ps.test

+9 −0
Original line number Diff line number Diff line
@@ -1146,4 +1146,13 @@ EXECUTE st1; 
DEALLOCATE PREPARE st1;

DROP TABLE t1;



#

# Bug #32137: prepared statement crash with str_to_date in update clause

#

create table t1 (a int, b tinyint);

prepare st1 from 'update t1 set b= (str_to_date(a, a))';

execute st1;

deallocate prepare st1;

drop table t1;



--echo End of 4.1 tests.

sql/item_timefunc.cc

+26 −23
Original line number Diff line number Diff line
@@ -2958,16 +2958,17 @@ Field *Item_func_str_to_date::tmp_table_field(TABLE *t_arg) 


void Item_func_str_to_date::fix_length_and_dec()

{

  char format_buff[64];

  String format_str(format_buff, sizeof(format_buff), &my_charset_bin);

  String *format;

  maybe_null= 1;

  decimals=0;

  cached_field_type= MYSQL_TYPE_STRING;

  max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN;

  cached_timestamp_type= MYSQL_TIMESTAMP_NONE;

  format= args[1]->val_str(&format_str);

  if (!args[1]->null_value && (const_item= args[1]->const_item()))

  if ((const_item= args[1]->const_item()))

  {

    char format_buff[64];

    String format_str(format_buff, sizeof(format_buff), &my_charset_bin);

    String *format= args[1]->val_str(&format_str);

    if (!args[1]->null_value)

    {

      cached_format_type= get_date_time_result_type(format->ptr(),

                                                    format->length());
@@ -2990,6 +2991,8 @@ void Item_func_str_to_date::fix_length_and_dec() 
      }

    }

  }

}





bool Item_func_str_to_date::get_date(TIME *ltime, uint fuzzy_date)

{