Commit b828758a authored by unknown's avatar unknown
Browse files

merge fixes 5.0-opt -> 5.1-opt

parent b2b69607

mysql-test/r/ctype_ucs.result

+2 −2
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ NOT NULL default 'passive' 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `status` enum('active','passive') character set latin1 collate latin1_general_ci NOT NULL default 'passive'

  `status` enum('active','passive') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t1 ADD a int NOT NULL AFTER status;

CREATE TABLE t2 (
@@ -772,7 +772,7 @@ NOT NULL default 'passive' 
SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `status` enum('active','passive') character set ucs2 collate ucs2_turkish_ci NOT NULL default 'passive'

  `status` enum('active','passive') CHARACTER SET ucs2 COLLATE ucs2_turkish_ci NOT NULL DEFAULT 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t2 ADD a int NOT NULL AFTER status;

DROP TABLE t1,t2;

sql/unireg.cc

+2 −1
Original line number Diff line number Diff line
@@ -866,7 +866,8 @@ static bool make_empty_rec(THD *thd, File file,enum legacy_db_type table_type, 
    /*

      regfield don't have to be deleted as it's allocated with sql_alloc()

    */

    Field *regfield=make_field((char*) buff+field->offset + data_offset,

    Field *regfield=make_field(&share,

                               (char*) buff+field->offset + data_offset,

                               field->length,

                               null_pos + null_count / 8,

			       null_count & 7,