logging_ok:

  Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets

BitKeeper/etc/logging_ok

@@ -244,6 +244,7 @@ venu@hundin.mysql.fi
 venu@myvenu.com
 venu@work.mysql.com
 vtkachenko@intelp4d.mysql.com
+vtkachenko@mail.mysql.com
 vva@eagle.mysql.r18.ru
 vva@genie.(none)
 vva@mysql.r18.ru

mysql-test/r/innodb.result

@@ -1745,21 +1745,21 @@ set global innodb_thread_concurrency=16;
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
 innodb_thread_concurrency	16
-show variables like "innodb_free_tickets_to_enter";
+show variables like "innodb_concurrency_tickets";
 Variable_name	Value
-innodb_free_tickets_to_enter	500
-set global innodb_free_tickets_to_enter=1000;
-show variables like "innodb_free_tickets_to_enter";
+innodb_concurrency_tickets	500
+set global innodb_concurrency_tickets=1000;
+show variables like "innodb_concurrency_tickets";
 Variable_name	Value
-innodb_free_tickets_to_enter	1000
-set global innodb_free_tickets_to_enter=0;
-show variables like "innodb_free_tickets_to_enter";
+innodb_concurrency_tickets	1000
+set global innodb_concurrency_tickets=0;
+show variables like "innodb_concurrency_tickets";
 Variable_name	Value
-innodb_free_tickets_to_enter	1
-set global innodb_free_tickets_to_enter=500;
-show variables like "innodb_free_tickets_to_enter";
+innodb_concurrency_tickets	1
+set global innodb_concurrency_tickets=500;
+show variables like "innodb_concurrency_tickets";
 Variable_name	Value
-innodb_free_tickets_to_enter	500
+innodb_concurrency_tickets	500
 show variables like "innodb_thread_sleep_delay";
 Variable_name	Value
 innodb_thread_sleep_delay	10000

mysql-test/t/innodb.test

@@ -1236,14 +1236,14 @@ show variables like "innodb_thread_concurrency";
 set global innodb_thread_concurrency=16;
 show variables like "innodb_thread_concurrency";
 
-# Test for innodb_free_tickets_to_enter variable
-show variables like "innodb_free_tickets_to_enter";
-set global innodb_free_tickets_to_enter=1000;
-show variables like "innodb_free_tickets_to_enter";
-set global innodb_free_tickets_to_enter=0;
-show variables like "innodb_free_tickets_to_enter";
-set global innodb_free_tickets_to_enter=500;
-show variables like "innodb_free_tickets_to_enter";
+# Test for innodb_concurrency_tickets variable
+show variables like "innodb_concurrency_tickets";
+set global innodb_concurrency_tickets=1000;
+show variables like "innodb_concurrency_tickets";
+set global innodb_concurrency_tickets=0;
+show variables like "innodb_concurrency_tickets";
+set global innodb_concurrency_tickets=500;
+show variables like "innodb_concurrency_tickets";
 
 # Test for innodb_thread_sleep_delay variable
 show variables like "innodb_thread_sleep_delay";

sql/mysqld.cc

@@ -4202,7 +4202,7 @@ enum options_mysqld
   OPT_INNODB_OPEN_FILES,
   OPT_INNODB_AUTOEXTEND_INCREMENT,
   OPT_INNODB_SYNC_SPIN_LOOPS,
-  OPT_INNODB_FREE_TICKETS_TO_ENTER,
+  OPT_INNODB_CONCURRENCY_TICKETS,
   OPT_INNODB_THREAD_SLEEP_DELAY,
   OPT_BDB_CACHE_SIZE,
   OPT_BDB_LOG_BUFFER_SIZE,
@@ -5054,7 +5054,7 @@ log and this option does nothing anymore.",
    (gptr*) &srv_n_spin_wait_rounds,
    (gptr*) &srv_n_spin_wait_rounds,
    0, GET_LONG, REQUIRED_ARG, 20L, 0L, ~0L, 0, 1L, 0},
-  {"innodb_free_tickets_to_enter", OPT_INNODB_FREE_TICKETS_TO_ENTER,
+  {"innodb_concurrency_tickets", OPT_INNODB_CONCURRENCY_TICKETS,
    "Number of times a thread is allowed to enter InnoDB within the same \
     SQL query after it has once got the ticket",
    (gptr*) &srv_n_free_tickets_to_enter,

sql/set_var.cc

@@ -380,7 +380,7 @@ sys_var_long_ptr	sys_innodb_autoextend_increment("innodb_autoextend_increment",
 							&srv_auto_extend_increment);
 sys_var_long_ptr	sys_innodb_sync_spin_loops("innodb_sync_spin_loops",
                                              &srv_n_spin_wait_rounds);
-sys_var_long_ptr  sys_innodb_free_tickets_to_enter("innodb_free_tickets_to_enter",
+sys_var_long_ptr  sys_innodb_concurrency_tickets("innodb_concurrency_tickets",
                                              &srv_n_free_tickets_to_enter);
 sys_var_long_ptr  sys_innodb_thread_sleep_delay("innodb_thread_sleep_delay",
                                                 &srv_thread_sleep_delay);
@@ -660,7 +660,7 @@ sys_var *sys_variables[]=
   &sys_innodb_max_purge_lag,
   &sys_innodb_autoextend_increment,
   &sys_innodb_sync_spin_loops,
-  &sys_innodb_free_tickets_to_enter,
+  &sys_innodb_concurrency_tickets,
   &sys_innodb_thread_sleep_delay,
   &sys_innodb_thread_concurrency,
 #endif  
@@ -754,6 +754,7 @@ struct show_var_st init_vars[]= {
   {"innodb_data_home_dir",  (char*) &innobase_data_home_dir,	    SHOW_CHAR_PTR},
   {"innodb_doublewrite", (char*) &innobase_use_doublewrite, SHOW_MY_BOOL},
   {"innodb_checksums", (char*) &innobase_use_checksums, SHOW_MY_BOOL},
+  {sys_innodb_concurrency_tickets.name, (char*) &sys_innodb_concurrency_tickets, SHOW_SYS},
   {"innodb_fast_shutdown", (char*) &innobase_fast_shutdown, SHOW_MY_BOOL},
   {"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG },
   {"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL},
@@ -761,7 +762,6 @@ struct show_var_st init_vars[]= {
   {"innodb_flush_log_at_trx_commit", (char*) &innobase_flush_log_at_trx_commit, SHOW_INT},
   {"innodb_flush_method",    (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},
   {"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG },
-  {sys_innodb_free_tickets_to_enter.name, (char*) &sys_innodb_free_tickets_to_enter, SHOW_SYS},
   {"innodb_lock_wait_timeout", (char*) &innobase_lock_wait_timeout, SHOW_LONG },
   {"innodb_log_arch_dir",   (char*) &innobase_log_arch_dir, 	    SHOW_CHAR_PTR},
   {"innodb_log_archive",    (char*) &innobase_log_archive, 	    SHOW_MY_BOOL},