#3557 merge 31879 from 5.0.5 to main refs[t:3557]

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

storage/tokudb/ha_tokudb.cc

@@ -5593,7 +5593,7 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
     if (lock_type != F_UNLCK) {
         is_fast_alter_running = false;
         use_write_locks = false;
-        if (get_tokudb_use_write_locks(thd) && lock_type == F_WRLCK)
+        if (lock_type == F_WRLCK)
             use_write_locks = true;
         if (!trx->tokudb_lock_count++) {
             DBUG_ASSERT(trx->stmt == 0);

storage/tokudb/hatoku_hton.cc

@@ -128,13 +128,6 @@ static MYSQL_THDVAR_UINT(block_size,
   ~0L,   // max
   1      // blocksize???
   );
-static MYSQL_THDVAR_BOOL(use_write_locks,
-  0,
-  "if on, will use write locks instead of read locks",
-  NULL, 
-  NULL, 
-  FALSE
-  );
 
 void tokudb_checkpoint_lock(THD * thd);
 void tokudb_checkpoint_unlock(THD * thd);
@@ -602,10 +595,6 @@ uint get_tokudb_block_size(THD* thd) {
     return THDVAR(thd, block_size);
 }
 
-bool get_tokudb_use_write_locks(THD* thd) {
-    return THDVAR(thd, use_write_locks) != 0;
-}
-
 typedef struct txn_progress_info {
     char status[200];
     THD* thd;
@@ -1545,7 +1534,6 @@ static struct st_mysql_sys_var *tokudb_system_variables[] = {
     MYSQL_SYSVAR(fs_reserve_percent),
     MYSQL_SYSVAR(tmp_dir),
     MYSQL_SYSVAR(block_size),
-    MYSQL_SYSVAR(use_write_locks),
     NULL
 };
 

storage/tokudb/hatoku_hton.h

@@ -19,7 +19,6 @@ bool get_disable_slow_alter(THD* thd);
 bool get_create_index_online(THD* thd);
 bool get_prelock_empty(THD* thd);
 uint get_tokudb_block_size(THD* thd);
-bool get_tokudb_use_write_locks(THD* thd);
 
 extern HASH tokudb_open_tables;
 extern pthread_mutex_t tokudb_mutex;