Commit 97ce1f8c authored by gluh@eagle.(none)'s avatar gluh@eagle.(none)
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
parents 88aa7b0a 20baa313

mysql-test/r/ctype_utf8.result

+8 −32
Original line number Diff line number Diff line
@@ -1742,25 +1742,13 @@ NULL 
Warnings:

Error	1300	Invalid utf8 character string: 'FF'

select hex(_utf8 0x616263FF);

hex(_utf8 0x616263FF)

NULL

Warnings:

Error	1300	Invalid utf8 character string: 'FF'

ERROR HY000: Invalid utf8 character string: 'FF'

select hex(_utf8 X'616263FF');

hex(_utf8 X'616263FF')

NULL

Warnings:

Error	1300	Invalid utf8 character string: 'FF'

ERROR HY000: Invalid utf8 character string: 'FF'

select hex(_utf8 B'001111111111');

hex(_utf8 B'001111111111')

NULL

Warnings:

Error	1300	Invalid utf8 character string: 'FF'

ERROR HY000: Invalid utf8 character string: 'FF'

select (_utf8 X'616263FF');

(_utf8 X'616263FF')

NULL

Warnings:

Error	1300	Invalid utf8 character string: 'FF'

ERROR HY000: Invalid utf8 character string: 'FF'

set sql_mode=default;

select hex(char(0xFF using utf8));

hex(char(0xFF using utf8))
@@ -1773,22 +1761,10 @@ hex(convert(0xFF using utf8)) 
Warnings:

Warning	1300	Invalid utf8 character string: 'FF'

select hex(_utf8 0x616263FF);

hex(_utf8 0x616263FF)

616263

Warnings:

Warning	1300	Invalid utf8 character string: 'FF'

ERROR HY000: Invalid utf8 character string: 'FF'

select hex(_utf8 X'616263FF');

hex(_utf8 X'616263FF')

616263

Warnings:

Warning	1300	Invalid utf8 character string: 'FF'

ERROR HY000: Invalid utf8 character string: 'FF'

select hex(_utf8 B'001111111111');

hex(_utf8 B'001111111111')

03

Warnings:

Warning	1300	Invalid utf8 character string: 'FF'

ERROR HY000: Invalid utf8 character string: 'FF'

select (_utf8 X'616263FF');

(_utf8 X'616263FF')

abc

Warnings:

Warning	1300	Invalid utf8 character string: 'FF'
 
ERROR HY000: Invalid utf8 character string: 'FF'

mysql-test/t/ctype_utf8.test

+8 −0
Original line number Diff line number Diff line
@@ -1412,14 +1412,22 @@ DROP TABLE t1, t2; 
set sql_mode=traditional;

select hex(char(0xFF using utf8));

select hex(convert(0xFF using utf8));

--error ER_INVALID_CHARACTER_STRING

select hex(_utf8 0x616263FF);

--error ER_INVALID_CHARACTER_STRING

select hex(_utf8 X'616263FF');

--error ER_INVALID_CHARACTER_STRING

select hex(_utf8 B'001111111111');

--error ER_INVALID_CHARACTER_STRING

select (_utf8 X'616263FF');

set sql_mode=default;

select hex(char(0xFF using utf8));

select hex(convert(0xFF using utf8));

--error ER_INVALID_CHARACTER_STRING

select hex(_utf8 0x616263FF);

--error ER_INVALID_CHARACTER_STRING

select hex(_utf8 X'616263FF');

--error ER_INVALID_CHARACTER_STRING

select hex(_utf8 B'001111111111');

--error ER_INVALID_CHARACTER_STRING

select (_utf8 X'616263FF');

sql/item.cc

+9 −3
Original line number Diff line number Diff line
@@ -4313,7 +4313,7 @@ bool Item::is_datetime() 
}





String *Item::check_well_formed_result(String *str)

String *Item::check_well_formed_result(String *str, bool send_error)

{

  /* Check whether we got a well-formed string */

  CHARSET_INFO *cs= str->charset();
@@ -4329,8 +4329,14 @@ String *Item::check_well_formed_result(String *str) 
    uint diff= str->length() - wlen;

    set_if_smaller(diff, 3);

    octet2hex(hexbuf, str->ptr() + wlen, diff);

    if (thd->variables.sql_mode &

        (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES))

    if (send_error)

    {

      my_error(ER_INVALID_CHARACTER_STRING, MYF(0),

               cs->csname,  hexbuf);

      return 0;

    }

    if ((thd->variables.sql_mode &

         (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES)))

    {

      level= MYSQL_ERROR::WARN_LEVEL_ERROR;

      null_value= 1;

sql/item.h

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ class Item { 
  bool is_datetime();

  virtual Field::geometry_type get_geometry_type() const

    { return Field::GEOM_GEOMETRY; };

  String *check_well_formed_result(String *str);

  String *check_well_formed_result(String *str, bool send_error= 0);

};

sql/sql_yacc.yy

+5 −10
Original line number Diff line number Diff line
@@ -9935,15 +9935,11 @@ literal: 
                                str ? str->ptr() : "",

                                str ? str->length() : 0,

                                $1);

            if ($$)

            {

              ((Item_string *) $$)->set_repertoire_from_value();

              if (!$$->check_well_formed_result(&$$->str_value))

            if (!$$ || !$$->check_well_formed_result(&$$->str_value, TRUE))

            {

                $$= new Item_null();

                $$->set_name(NULL, 0, system_charset_info);

              }

              MYSQL_YYABORT;

            }

            ((Item_string *) $$)->set_repertoire_from_value();

          }

        | UNDERSCORE_CHARSET BIN_NUM

          {
@@ -9959,10 +9955,9 @@ literal: 
                                str ? str->ptr() : "",

                                str ? str->length() : 0,

                                $1);

            if ($$ && !$$->check_well_formed_result(&$$->str_value))

            if (!$$ || !$$->check_well_formed_result(&$$->str_value, TRUE))

            {

              $$= new Item_null();

              $$->set_name(NULL, 0, system_charset_info);

              MYSQL_YYABORT;

            }

          }

	| DATE_SYM text_literal { $$ = $2; }