Commit 33dfb4ea authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0-rpl 

into  mysql.com:/usr/home/bar/mysql-5.1-rpl


BitKeeper/etc/collapsed:
  auto-union
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
mysql-test/t/rpl_ignore_table.test:
  After merge fix.
sql/slave.cc:
  After merge fix
parents 3ff00986 fff7e919

BitKeeper/etc/collapsed

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ 
4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

include/m_ctype.h

+6 −6
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ typedef struct my_charset_handler_st 
               const unsigned char *s, const unsigned char *e);

  

  /* Functions for case and sort conversion */

  void    (*caseup_str)(struct charset_info_st *, char *);

  void    (*casedn_str)(struct charset_info_st *, char *);

  uint    (*caseup_str)(struct charset_info_st *, char *);

  uint    (*casedn_str)(struct charset_info_st *, char *);

  uint    (*caseup)(struct charset_info_st *, char *src, uint srclen,

                                              char *dst, uint dstlen);

  uint    (*casedn)(struct charset_info_st *, char *src, uint srclen,
@@ -324,8 +324,8 @@ extern uint my_instr_simple(struct charset_info_st *, 




/* Functions for 8bit */

extern void my_caseup_str_8bit(CHARSET_INFO *, char *);

extern void my_casedn_str_8bit(CHARSET_INFO *, char *);

extern uint my_caseup_str_8bit(CHARSET_INFO *, char *);

extern uint my_casedn_str_8bit(CHARSET_INFO *, char *);

extern uint my_caseup_8bit(CHARSET_INFO *, char *src, uint srclen,

                                           char *dst, uint dstlen);

extern uint my_casedn_8bit(CHARSET_INFO *, char *src, uint srclen,
@@ -415,8 +415,8 @@ int my_mbcharlen_8bit(CHARSET_INFO *, uint c); 




/* Functions for multibyte charsets */

extern void my_caseup_str_mb(CHARSET_INFO *, char *);

extern void my_casedn_str_mb(CHARSET_INFO *, char *);

extern uint my_caseup_str_mb(CHARSET_INFO *, char *);

extern uint my_casedn_str_mb(CHARSET_INFO *, char *);

extern uint my_caseup_mb(CHARSET_INFO *, char *src, uint srclen,

                                         char *dst, uint dstlen);

extern uint my_casedn_mb(CHARSET_INFO *, char *src, uint srclen,

mysql-test/r/lowercase_table.result

+24 −0
Original line number Diff line number Diff line
@@ -84,3 +84,27 @@ create table t2 like T1; 
drop table t1, t2;

show tables;

Tables_in_test

set names utf8;

drop table if exists İ,İİ;

create table İ (s1 int);

show create table İ;

Table	Create Table

İ	CREATE TABLE `i` (

  `s1` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show tables;

Tables_in_test

i

drop table İ;

create table İİ (s1 int);

show create table İİ;

Table	Create Table

İİ	CREATE TABLE `ii` (

  `s1` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show tables;

Tables_in_test

ii

drop table İİ;

set names latin1;

End of 5.0 tests

mysql-test/r/rpl_ignore_table.result

+16 −0
Original line number Diff line number Diff line
@@ -14,3 +14,19 @@ SELECT * FROM t4; 
a

DROP TABLE t1;

DROP TABLE t4;

DROP TABLE IF EXISTS t5;

CREATE TABLE t5 (

word varchar(50) collate utf8_unicode_ci NOT NULL default ''

) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

SET @@session.character_set_client=33,@@session.collation_connection=192;

CREATE TEMPORARY TABLE tmptbl504451f4258$1 (id INT NOT NULL) ENGINE=MEMORY;

INSERT INTO t5 (word)  VALUES ('TEST’');

SELECT HEX(word) FROM t5;

HEX(word)

54455354E28099

SELECT HEX(word) FROM t5;

HEX(word)

54455354E28099

SELECT * FROM tmptbl504451f4258$1;

ERROR 42S02: Table 'test.tmptbl504451f4258$1' doesn't exist

DROP TABLE t5;

mysql-test/t/lowercase_table.test

+20 −0
Original line number Diff line number Diff line
@@ -85,3 +85,23 @@ drop table t1, t2; 
show tables;



# End of 4.1 tests





#

# Bug#20404: SHOW CREATE TABLE fails with Turkish I

#

set names utf8;

--disable_warnings

drop table if exists İ,İİ;

--enable_warnings

create table İ (s1 int);

show create table İ;

show tables;

drop table İ;

create table İİ (s1 int);

show create table İİ;

show tables;

drop table İİ;

set names latin1;



--echo End of 5.0 tests