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

Merge bk-internal:/home/bk/mysql-5.0-rpl 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
parents b274c522 c317c2d2

client/mysql.cc

+8 −3
Original line number Diff line number Diff line
@@ -2513,10 +2513,15 @@ print_table_data_xml(MYSQL_RES *result) 
    {

      tee_fprintf(PAGER, "\t<field name=\"");

      xmlencode_print(fields[i].name, (uint) strlen(fields[i].name));

      if (cur[i])

      {

        tee_fprintf(PAGER, "\">");

        xmlencode_print(cur[i], lengths[i]);

        tee_fprintf(PAGER, "</field>\n");

      }

      else

        tee_fprintf(PAGER, "\" xsi:nil=\"true\" />\n");

    }

    (void) tee_fputs("  </row>\n", PAGER);

  }

  (void) tee_fputs("</resultset>\n", PAGER);

include/m_ctype.h

+10 −0
Original line number Diff line number Diff line
@@ -205,6 +205,9 @@ typedef struct my_charset_handler_st 
			 int *err);

  longlong    (*strtoll10)(struct charset_info_st *cs,

                           const char *nptr, char **endptr, int *error);

  ulonglong   (*strntoull10rnd)(struct charset_info_st *cs,

                                const char *str, uint length, int unsigned_fl,

                                char **endptr, int *error);

  ulong        (*scan)(struct charset_info_st *, const char *b, const char *e,

		       int sq);

} MY_CHARSET_HANDLER;
@@ -342,6 +345,13 @@ longlong my_strtoll10_8bit(CHARSET_INFO *cs, 
longlong my_strtoll10_ucs2(CHARSET_INFO *cs, 

                           const char *nptr, char **endptr, int *error);



ulonglong my_strntoull10rnd_8bit(CHARSET_INFO *cs,

                                 const char *str, uint length, int unsigned_fl,

                                 char **endptr, int *error);

ulonglong my_strntoull10rnd_ucs2(CHARSET_INFO *cs, 

                                 const char *str, uint length, int unsigned_fl,

                                 char **endptr, int *error);



void my_fill_8bit(CHARSET_INFO *cs, char* to, uint l, int fill);



my_bool  my_like_range_simple(CHARSET_INFO *cs,

mysql-test/r/client_xml.result

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b'); 
<resultset statement="select null from dual

">

  <row>

	<field name="NULL">NULL</field>

	<field name="NULL" xsi:nil="true" />

  </row>

</resultset>

drop table t1;

mysql-test/r/ctype_gbk.result

+10 −0
Original line number Diff line number Diff line
@@ -168,3 +168,13 @@ DROP TABLE t1; 
select hex(convert(_gbk 0xA14041 using ucs2));

hex(convert(_gbk 0xA14041 using ucs2))

003F0041

create table t1 (c1 text not null, c2 text not null) character set gbk;

alter table t1 change c1 c1 mediumtext  character set gbk not null;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` mediumtext NOT NULL,

  `c2` text NOT NULL

) ENGINE=MyISAM DEFAULT CHARSET=gbk

drop table t1;

End of 5.0 tests

mysql-test/r/ctype_utf8.result

+18 −0
Original line number Diff line number Diff line
@@ -1461,3 +1461,21 @@ set @a:=null; 
execute my_stmt using @a;

a	b

drop table if exists t1;

CREATE TABLE t1 (

colA int(11) NOT NULL,

colB varchar(255) character set utf8 NOT NULL,

PRIMARY KEY  (colA)

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

INSERT INTO t1 (colA, colB) VALUES (1, 'foo'), (2, 'foo bar');

CREATE TABLE t2 (

colA int(11) NOT NULL,

colB varchar(255) character set utf8 NOT NULL,

KEY bad  (colA,colB(3))

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

INSERT INTO t2 (colA, colB) VALUES (1, 'foo'),(2, 'foo bar');

SELECT * FROM t1 JOIN t2 ON t1.colA=t2.colA AND t1.colB=t2.colB

WHERE t1.colA < 3;

colA	colB	colA	colB

1	foo	1	foo

2	foo bar	2	foo bar

DROP TABLE t1, t2;