Manual merge

mysql-test/mysql-test-run.pl:
  Merge
sql/mysqld.cc:
  Merge

mysql-test/lib/mtr_stress.pl

@@ -21,7 +21,6 @@ sub run_stress_test ()
 {
 
   my $args;
-  my $stress_basedir;
   my $stress_suitedir;
 
   mtr_report("Starting stress testing\n");

mysql-test/mysql-test-run.pl

@@ -166,7 +166,6 @@ our $path_my_basedir;
 our $opt_vardir;                 # A path but set directly on cmd line
 our $opt_vardir_trace;           # unix formatted opt_vardir for trace files
 our $opt_tmpdir;                 # A path but set directly on cmd line
-our $opt_restart_cleanup;        # Source a file with SQL drop statements
 
 our $opt_usage;
 our $opt_suite;
@@ -588,16 +587,18 @@ sub command_line_setup () {
              'with-ndbcluster-only'     => \$opt_with_ndbcluster_only,
              'ndb-extra-test'           => \$opt_ndb_extra_test,
              'do-test=s'                => \$opt_do_test,
+             'start-from=s'             => \$opt_start_from,
              'suite=s'                  => \$opt_suite,
              'skip-rpl'                 => \$opt_skip_rpl,
              'skip-im'                  => \$opt_skip_im,
              'skip-test=s'              => \$opt_skip_test,
+             'big-test'                 => \$opt_big_test,
 
              # Specify ports
              'master_port=i'            => \$opt_master_myport,
              'slave_port=i'             => \$opt_slave_myport,
-             'ndbcluster_port=i'        => \$opt_ndbcluster_port,
-             'ndbcluster_port_slave=i'  => \$opt_ndbcluster_port_slave,
+             'ndbcluster-port=i'        => \$opt_ndbcluster_port,
+             'ndbcluster-port-slave=i'  => \$opt_ndbcluster_port_slave,
              'manager-port=i'           => \$opt_manager_port, # Currently not used
              'im-port=i'                => \$im_port, # Instance Manager port.
              'im-mysqld1-port=i'        => \$im_mysqld1_port, # Port of mysqld, controlled by IM
@@ -607,13 +608,13 @@ sub command_line_setup () {
              'record'                   => \$opt_record,
              'check-testcases'          => \$opt_check_testcases,
 
-             # ???
+             # Extra options used when starting mysqld
              'mysqld=s'                 => \@opt_extra_mysqld_opt,
 
              # Run test on running server
              'extern'                   => \$opt_extern,
-             'ndbconnectstring=s'       => \$opt_ndbconnectstring,
-             'ndbconnectstring-slave=s' => \$opt_ndbconnectstring_slave,
+             'ndb-connectstring=s'       => \$opt_ndbconnectstring,
+             'ndb-connectstring-slave=s' => \$opt_ndbconnectstring_slave,
 
              # Debugging
              'gdb'                      => \$opt_gdb,
@@ -652,7 +653,6 @@ sub command_line_setup () {
              'vardir=s'                 => \$opt_vardir,
 
              # Misc
-             'big-test'                 => \$opt_big_test,
              'comment=s'                => \$opt_comment,
              'debug'                    => \$opt_debug,
              'fast'                     => \$opt_fast,
@@ -661,13 +661,11 @@ sub command_line_setup () {
              'netware'                  => \$opt_netware,
              'old-master'               => \$opt_old_master,
              'reorder'                  => \$opt_reorder,
-             'restart-cleanup'          => \$opt_restart_cleanup,
              'script-debug'             => \$opt_script_debug,
              'sleep=i'                  => \$opt_sleep,
              'socket=s'                 => \$opt_socket,
              'start-dirty'              => \$opt_start_dirty,
              'start-and-exit'           => \$opt_start_and_exit,
-             'start-from=s'             => \$opt_start_from,
              'timer'                    => \$opt_timer,
              'unified-diff|udiff'       => \$opt_udiff,
              'user-test=s'              => \$opt_user_test,
@@ -3260,12 +3258,6 @@ sub run_mysqltest ($) {
     mtr_add_arg($args, "--sleep=%d", $opt_sleep);
   }
 
-  if ( $opt_restart_cleanup and $glob_mysqld_restart )
-  {
-    mtr_add_arg($args, "--include=%s", "include/drop-on-restart.inc");
-    $glob_mysqld_restart= 0;
-  }
-
   if ( $opt_debug )
   {
     mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir_trace);
@@ -3561,12 +3553,15 @@ Options to control what test suites or cases to run
   skip-rpl              Skip the replication test cases.
   skip-im               Don't start IM, and skip the IM test cases
   skip-test=PREFIX      Skip test cases which name are prefixed with PREFIX
+  big-test              Pass "--big-test" to mysqltest which will set the environment
+                        variable BIG_TEST, which can be checked from test cases.
 
 Options that specify ports
 
   master_port=PORT      Specify the port number used by the first master
   slave_port=PORT       Specify the port number used by the first slave
-  ndbcluster_port=PORT  Specify the port number used by cluster
+  ndbcluster-port=PORT  Specify the port number used by cluster
+  ndbcluster-port-slave=PORT  Specify the port number used by slave cluster
 
 Options for test case authoring
 
@@ -3620,16 +3615,14 @@ Misc options
   help                  Get this help text
   unified-diff | udiff  When presenting differences, use unified diff
 
-  testcase-timeout=MINUTES Max test case run time (default 5)
-  suite-timeout=MINUTES    Max test suite run time (default 120)
+  testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout)
+  suite-timeout=MINUTES    Max test suite run time (default $default_suite_timeout)
 
 Deprecated options
   with-openssl          Deprecated option for ssl
 
 
 Options not yet described, or that I want to look into more
-
-  big-test              
   debug                 
   local                 
   local-master          

sql/ha_heap.cc

@@ -524,7 +524,6 @@ THR_LOCK_DATA **ha_heap::store_lock(THD *thd,
 
 int ha_heap::delete_table(const char *name)
 {
-  char buff[FN_REFLEN];
   int error= heap_delete_table(name);
   return error == ENOENT ? 0 : error;
 }

sql/handler.cc

@@ -445,8 +445,6 @@ static my_bool init_handlerton(THD *unused1, st_plugin_int *plugin,
 int ha_init()
 {
   int error= 0;
-  handlerton **types;
-  show_table_alias_st *table_alias;
   total_ha= savepoint_alloc_size= 0;
 
   if (ha_init_errors())

sql/item_timefunc.cc

@@ -2028,7 +2028,6 @@ void Item_date_add_interval::fix_length_and_dec()
 
 bool Item_date_add_interval::get_date(TIME *ltime, uint fuzzy_date)
 {
-  long period,sign;
   INTERVAL interval;
 
   if (args[0]->get_date(ltime, TIME_NO_ZERO_DATE) ||

sql/key.cc

@@ -468,7 +468,6 @@ int key_rec_cmp(void *key, byte *first_rec, byte *second_rec)
   do
   {
     Field *field= key_part->field;
-    uint length;
 
     if (key_part->null_bit)
     {

sql/log.cc

@@ -717,8 +717,6 @@ bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length,
   bool error= FALSE;
   Log_event_handler **current_handler= slow_log_handler_list;
   bool is_command= FALSE;
-
-  char message_buff[MAX_LOG_BUFFER_SIZE];
   char user_host_buff[MAX_USER_HOST_SIZE];
 
   my_time_t current_time;

sql/mysqld.cc

@@ -8183,6 +8183,7 @@ ulong srv_thread_sleep_delay;
 ulong srv_thread_concurrency;
 ulong srv_commit_concurrency;
 }
+
 #endif
 
 #ifndef WITH_NDBCLUSTER_STORAGE_ENGINE

sql/sp.cc

@@ -668,7 +668,6 @@ db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics)
 {
   TABLE *table;
   int ret;
-  bool opened;
   DBUG_ENTER("db_update_routine");
   DBUG_PRINT("enter", ("type: %d name: %.*s",
 		       type, name->m_name.length, name->m_name.str));

sql/sp_cache.cc

@@ -124,7 +124,6 @@ void sp_cache_clear(sp_cache **cp)
 void sp_cache_insert(sp_cache **cp, sp_head *sp)
 {
   sp_cache *c;
-  ulong v;
 
   if (!(c= *cp))
   {

sql/sql_base.cc

@@ -1408,10 +1408,7 @@ void update_non_unique_table_error(TABLE_LIST *update,
 
 TABLE *find_temporary_table(THD *thd, const char *db, const char *table_name)
 {
-  char	key[MAX_DBKEY_LENGTH];
-  uint	key_length;
   TABLE_LIST table_list;
-  TABLE *table;
 
   table_list.db= (char*) db;
   table_list.table_name= (char*) table_name;
@@ -1939,7 +1936,6 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
   }
   else
   {
-    TABLE_SHARE *share;
     /* Free cache if too big */
     while (open_cache.records > table_cache_size && unused_tables)
       VOID(hash_delete(&open_cache,(byte*) unused_tables)); /* purecov: tested */