MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Konstantin Osipov Date:August 12 2009 1:11pm
Subject:bzr commit into mysql-5.1-bugteam branch (kostja:3065) Bug#45829
View as plain text  
#At file:///opt/local/work/5.1-bugteam/ based on revid:kostja@stripped

 3065 Konstantin Osipov	2009-08-12
      A follow up patch for the follow up patch for Bug#45829 
      "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted, 
      does nothing".
      
      Put back stubs for members of structures that are shared between
      sql/ and pluggable storage engines. to not break ABI unnecessarily.
      To be NULL-merged into 5.4, where we do break the ABI already.

    modified:
      sql/handler.h
      sql/table.h
=== modified file 'sql/handler.h'
--- a/sql/handler.h	2009-08-12 10:57:41 +0000
+++ b/sql/handler.h	2009-08-12 13:11:06 +0000
@@ -895,6 +895,8 @@ class partition_info;
 struct st_partition_iter;
 #define NOT_A_PARTITION_ID ((uint32)-1)
 
+enum enum_ha_unused { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES };
+
 typedef struct st_ha_create_information
 {
   CHARSET_INFO *table_charset, *default_table_charset;
@@ -916,10 +918,12 @@ typedef struct st_ha_create_information
   uint options;				/* OR of HA_CREATE_ options */
   uint merge_insert_method;
   uint extra_size;                      /* length of extra data segment */
+  enum enum_ha_unused unused1;
   bool table_existed;			/* 1 in create if table existed */
   bool frm_only;                        /* 1 if no ha_create_table() */
   bool varchar;                         /* 1 if table has a VARCHAR */
   enum ha_storage_media storage_media;  /* DEFAULT, DISK or MEMORY */
+  enum enum_ha_unused unused2;
 } HA_CREATE_INFO;
 
 

=== modified file 'sql/table.h'
--- a/sql/table.h	2009-08-12 10:57:41 +0000
+++ b/sql/table.h	2009-08-12 13:11:06 +0000
@@ -361,6 +361,8 @@ typedef struct st_table_share
   }
   enum row_type row_type;		/* How rows are stored */
   enum tmp_table_type tmp_table;
+  enum enum_ha_unused unused1;
+  enum enum_ha_unused unused2;
 
   uint ref_count;                       /* How many TABLE objects uses this */
   uint open_count;			/* Number of tables in open list */


Attachment: [text/bzr-bundle] bzr/kostja@sun.com-20090812131106-wv9y6agdaoqycx49.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (kostja:3065) Bug#45829Konstantin Osipov12 Aug