Commit 5556f53d authored by unknown's avatar unknown
Browse files

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/heikki/mysql-4.1
parents 352593ec f813e0da

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;

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+4 −0
Original line number Diff line number Diff line
@@ -2976,6 +2976,8 @@ void Dbdih::execCOPY_FRAGREF(Signal* signal) 
  SystemError * const sysErr = (SystemError*)&signal->theData[0];

  sysErr->errorCode = SystemError::CopyFragRefError;

  sysErr->errorRef = reference();

  sysErr->data1 = errorCode;

  sysErr->data2 = 0;

  sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal, 

	     SystemError::SignalLength, JBB);

  return;
@@ -4492,6 +4494,8 @@ void Dbdih::handleTakeOverNewMaster(Signal* signal, Uint32 takeOverPtrI) 
	SystemError * const sysErr = (SystemError*)&signal->theData[0];

	sysErr->errorCode = SystemError::CopyFragRefError;

	sysErr->errorRef = reference();

	sysErr->data1= 0;

	sysErr->data2= __LINE__;

	sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal, 

		   SystemError::SignalLength, JBB);

      }

sql/sql_show.cc

+2 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,8 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list) 
      /* Check if we have a key part that only uses part of the field */

      if (!(key_info->flags & HA_FULLTEXT) && (!key_part->field ||

          key_part->length != table->field[key_part->fieldnr-1]->key_length()))

        protocol->store_tiny((longlong) key_part->length);

        protocol->store_tiny((longlong) key_part->length / 

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

      else

        protocol->store_null();

      protocol->store_null();                   // No pack_information yet