Commit 8233b914 authored by unknown's avatar unknown
Browse files

After merge fix (WL#3567).

parent 3e35fffa

sql/ha_myisam.cc

+2 −1
Original line number Diff line number Diff line
@@ -1728,12 +1728,13 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, 
		      HA_CREATE_INFO *info)

{

  int error;

  uint create_flags= 0, options= table_arg->db_options_in_use, records;

  uint create_flags= 0, records;

  char buff[FN_REFLEN];

  MI_KEYDEF *keydef;

  MI_COLUMNDEF *recinfo;

  MI_CREATE_INFO create_info;

  TABLE_SHARE *share= table->s;

  uint options= share->db_options_in_use;

  DBUG_ENTER("ha_myisam::create");

  if ((error= table2myisam(table_arg, &keydef, &recinfo, &records)))

    DBUG_RETURN(error); /* purecov: inspected */

sql/ha_myisammrg.cc

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int ha_myisammrg::open(const char *name, int mode, uint test_if_locked) 
  MI_COLUMNDEF *recinfo;

  MYRG_TABLE *u_table;

  uint recs;

  uint keys= table->keys;

  uint keys= table->s->keys;

  int error;

  char name_buff[FN_REFLEN];