Commit 40305d7a authored by unknown's avatar unknown
Browse files

After merge fixes

parent cc542b2f

sql/handler.cc

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ st_plugin_int *hton2plugin[MAX_HA]; 


static handlerton *installed_htons[128];



#define BITMAP_STACKBUF_SIZE (128/8)



KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NullS,0} };



/* static functions defined in this file */

sql/sql_class.h

+1 −4
Original line number Diff line number Diff line
@@ -1611,14 +1611,11 @@ class select_create: public select_insert { 
		 List<Item> &select_fields,enum_duplicates duplic, bool ignore)

    :select_insert (NULL, NULL, &select_fields, 0, 0, duplic, ignore),

    create_table(table), extra_fields(&fields_par),keys(&keys_par),

    create_info(create_info_par),

    lock(0)

    create_info(create_info_par)

    {}

  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);



#ifdef HAVE_ROW_BASED_REPLICATION

  void binlog_show_create_table(TABLE **tables, uint count);

#endif

  void store_values(List<Item> &values);

  void send_error(uint errcode,const char *err);

  bool send_eof();

sql/sql_insert.cc

+1 −1
Original line number Diff line number Diff line
@@ -2772,7 +2772,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 
  unit= u;

  if (!(table= create_table_from_items(thd, create_info, create_table,

                                       extra_fields, keys, &values, &lock,

                                       &hook_ptr)))

                                       hook_ptr)))

    DBUG_RETURN(-1);				// abort() deletes table



  if (table->s->fields < values.elements)