Commit 99b49c32 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.1-14673 

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged
parents 5a07a098 e99b11d3

mysql-test/r/partition.result

+5 −0
Original line number Diff line number Diff line
@@ -428,4 +428,9 @@ partition by list (a) 
alter table t1 rebuild partition;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

drop table t1;

create table t1 (a int) engine=innodb partition by hash(a) ;

show table status like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	PARTITION	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

drop table t1;

End of 5.1 tests

mysql-test/t/partition.test

+7 −0
Original line number Diff line number Diff line
@@ -552,4 +552,11 @@ alter table t1 rebuild partition; 


drop table t1;



#

# Bug #14673: Wrong InnoDB default row format

#

create table t1 (a int) engine=innodb partition by hash(a) ;

show table status like 't1';

drop table t1;



--echo End of 5.1 tests

sql/ha_partition.cc

+16 −0
Original line number Diff line number Diff line
@@ -5115,6 +5115,22 @@ const char *ha_partition::index_type(uint inx) 
}





enum row_type ha_partition::get_row_type() const

{

  handler **file;

  enum row_type type= (*m_file)->get_row_type();



  for (file= m_file, file++; *file; file++)

  {

    enum row_type part_type= (*file)->get_row_type();

    if (part_type != type)

      return ROW_TYPE_NOT_USED;

  }



  return type;

}





void ha_partition::print_error(int error, myf errflag)

{

  DBUG_ENTER("ha_partition::print_error");

sql/ha_partition.h

+3 −0
Original line number Diff line number Diff line
@@ -527,6 +527,9 @@ class ha_partition :public handler 
  virtual const char *table_type() const

  { return "PARTITION"; }



  /* The name of the row type used for the underlying tables. */

  virtual enum row_type get_row_type() const;



  /*

     Handler specific error messages

  */