Commit 5d4f4a81 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into mysql.com:/home/mydev/mysql-5.0-5000
parents 7195b010 90f94790

configure.in

+9 −0
Original line number Diff line number Diff line
@@ -2572,6 +2572,15 @@ EOF 
    AC_CONFIG_SUBDIRS(innobase)

  fi



case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in

  *solaris*-i?86-no-yes)

  # ndb fail for whatever strange reason to link Sun Forte/x86

  # unless using incremental linker

  CXXFLAGS="$CXXFLAGS -xildon"

  ;;

  *) ;;

esac



  if test X"$have_ndbcluster" = Xyes

  then

    if test X"$mysql_cv_compress" != Xyes

mysql-test/r/ctype_mb.result

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW KEYS FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	key_a	1	a	A	NULL	9	NULL	YES	BTREE	

t1	1	key_a	1	a	A	NULL	3	NULL	YES	BTREE	

ALTER TABLE t1 CHANGE a a CHAR(4);

SHOW CREATE TABLE t1;

Table	Create Table
@@ -53,5 +53,5 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW KEYS FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	key_a	1	a	A	NULL	9	NULL	YES	BTREE	

t1	1	key_a	1	a	A	NULL	3	NULL	YES	BTREE	

DROP TABLE t1;

sql/sql_show.cc

+2 −1
Original line number Diff line number Diff line
@@ -2607,7 +2607,8 @@ static int get_schema_stat_record(THD *thd, struct st_table_list *tables, 
             key_part->length != 

             show_table->field[key_part->fieldnr-1]->key_length()))

        {

          table->field[10]->store((longlong) key_part->length);

          table->field[10]->store((longlong) key_part->length / 

                                  key_part->field->charset()->mbmaxlen);

          table->field[10]->set_notnull();

        }

        uint flags= key_part->field ? key_part->field->flags : 0;