[t:3038], move changes to main

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@25704 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/ha_tokudb.h

@@ -79,6 +79,8 @@ typedef struct st_tokudb_share {
 
     bool has_unique_keys;
     bool replace_into_fast;
+    rw_lock_t num_DBs_lock;
+    u_int32_t num_DBs;
 } TOKUDB_SHARE;
 
 #define HA_TOKU_VERSION 3
@@ -309,7 +311,6 @@ private:
     DBT *create_dbt_key_from_table(DBT * key, uint keynr, uchar * buff, const uchar * record, bool* has_null, int key_length = MAX_KEY_LENGTH);
     DBT* create_dbt_key_for_lookup(DBT * key, KEY* key_info, uchar * buff, const uchar * record, bool* has_null, int key_length = MAX_KEY_LENGTH);
     DBT *pack_key(DBT * key, uint keynr, uchar * buff, const uchar * key_ptr, uint key_length, int8_t inf_byte);
-    int remove_key(DB_TXN * trans, uint keynr, const uchar * record, DBT * prim_key);
     int key_cmp(uint keynr, const uchar * old_row, const uchar * new_row);
     int handle_cursor_error(int error, int err_to_return, uint keynr);
     DBT *get_pos(DBT * to, uchar * pos);

storage/tokudb/hatoku_hton.cc

@@ -98,6 +98,13 @@ static MYSQL_THDVAR_BOOL(load_save_space,
   NULL, 
   FALSE
   );
+static MYSQL_THDVAR_BOOL(create_index_online,
+  0,
+  "if on, create index done online",
+  NULL, 
+  NULL, 
+  FALSE
+  );
 static MYSQL_THDVAR_BOOL(prelock_empty,
   0,
   "Tokudb Prelock Empty Table",
@@ -545,6 +552,10 @@ bool get_load_save_space(THD* thd) {
     return (THDVAR(thd, load_save_space) != 0);
 }
 
+bool get_create_index_online(THD* thd) {
+    return (THDVAR(thd, create_index_online) != 0);
+}
+
 bool get_prelock_empty(THD* thd) {
     return (THDVAR(thd, prelock_empty) != 0);
 }
@@ -1423,6 +1434,7 @@ static struct st_mysql_sys_var *tokudb_system_variables[] = {
     MYSQL_SYSVAR(read_lock_wait),
     MYSQL_SYSVAR(pk_insert_mode),
     MYSQL_SYSVAR(load_save_space),
+    MYSQL_SYSVAR(create_index_online),
     MYSQL_SYSVAR(version),
     MYSQL_SYSVAR(init_flags),
     MYSQL_SYSVAR(checkpointing_period),

storage/tokudb/hatoku_hton.h

@@ -15,6 +15,7 @@ ulonglong get_write_lock_wait_time (THD* thd);
 ulonglong get_read_lock_wait_time (THD* thd);
 uint get_pk_insert_mode(THD* thd);
 bool get_load_save_space(THD* thd);
+bool get_create_index_online(THD* thd);
 bool get_prelock_empty(THD* thd);
 
 extern HASH tokudb_open_tables;