Commit c9a03e17 authored by unknown's avatar unknown
Browse files

logging_ok: 

  Logging to logging@openlogging.org accepted
sql_show.cc, type_enum.test, type_enum.result:
  Bug #5628 German characters in field-defs will be '?' with some table definitions


mysql-test/r/type_enum.result:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
mysql-test/t/type_enum.test:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
sql/sql_show.cc:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent f2821fa1

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ bar@bar.udmsearch.izhnet.ru 
bar@deer.(none)

bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

mysql-test/r/type_enum.result

+16 −0
Original line number Diff line number Diff line
@@ -1661,3 +1661,19 @@ t1 CREATE TABLE `t1` ( 
  `a` enum('','1','2') NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

set names latin1;

CREATE TABLE t1 (

a INT  default 1,

b ENUM('value','_value','') character set latin1 NOT NULL

);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default '1',

  `b` enum('value','_value','') NOT NULL default 'value'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show columns from t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	YES		1	

b	enum('value','_value','')			value	

drop table t1;

mysql-test/t/type_enum.test

+14 −0
Original line number Diff line number Diff line
@@ -45,3 +45,17 @@ create table t1 (a enum(0xE4, '1', '2') not null default 0xE4); 
show columns from t1;

show create table t1;

drop table t1;





#

# Bug #5628 German characters in field-defs will be '?'

# with some table definitions

#

set names latin1;

CREATE TABLE t1 (

  a INT  default 1,

  b ENUM('value','_value','') character set latin1 NOT NULL

);

show create table t1;

show columns from t1;

drop table t1;

sql/sql_show.cc

+2 −0
Original line number Diff line number Diff line
@@ -1265,6 +1265,8 @@ store_create_info(THD *thd, TABLE *table, String *packet) 
    // check for surprises from the previous call to Field::sql_type()

    if (type.ptr() != tmp)

      type.set(tmp, sizeof(tmp), system_charset_info);

    else

      type.set_charset(system_charset_info);



    field->sql_type(type);

    packet->append(type.ptr(), type.length(), system_charset_info);