Commit 2fec8851 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/home/my/mysql-5.1


sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Manual merge
parents a1db0e72 07d8be45

include/mysql/plugin.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ __MYSQL_DECLARE_PLUGIN(NAME, \ 
                 builtin_ ## NAME ## _sizeof_struct_st_plugin, \

                 builtin_ ## NAME ## _plugin)



#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0}}

#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0}}



/*

  declarations for SHOW STATUS support in plugins

mysql-test/mysql-test-run.pl

+16 −9
Original line number Diff line number Diff line
@@ -1633,7 +1633,7 @@ sub environment_setup () { 
  # ----------------------------------------------------

  # We are nice and report a bit about our settings

  # ----------------------------------------------------

  if (!$opt_extern)

  if (!$opt_extern && $opt_verbose)

  {

    print "Using MTR_BUILD_THREAD      = $ENV{MTR_BUILD_THREAD}\n";

    print "Using MASTER_MYPORT         = $ENV{MASTER_MYPORT}\n";
@@ -2270,6 +2270,11 @@ sub initialize_servers () { 
    }

    check_running_as_root();

  }

  else

  {

    # We have to create the 'var' and related directories

    cleanup_stale_files();

  }

}



sub mysql_install_db () {
@@ -2590,6 +2595,8 @@ sub do_before_run_mysqltest($) 
  }





  if (!$opt_extern)

  {

    # MASV cleanup...

    mtr_tonewfile($path_current_test_log,"$tname\n"); # Always tell where we are
@@ -2597,11 +2604,11 @@ sub do_before_run_mysqltest($) 
    mtr_tofile($file_ndb_testrun_log,"CURRENT TEST $tname\n");



    mtr_tofile($master->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n");

  if ( $master->[1]->{'pid'} )

  {

    if ( $master->[1]->{'pid'} ) {

      mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");

    }

  }

}



sub do_after_run_mysqltest($)

{

server-tools/instance-manager/commands.cc

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ Abstract_option_cmd::get_instance_options_list(const LEX_STRING *instance_name) 


int Abstract_option_cmd::execute_impl(st_net *net, ulong connection_id)

{

  int err_code;

  int err_code= 0;



  /* Check that all the specified instances exist and are offline. */

server-tools/instance-manager/guardian.cc

+5 −5
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void Guardian_thread::process_instance(Instance *instance, 
    {

      /* clear status fields */

      log_info("guardian: instance %s is running, set state to STARTED",

               instance->options.instance_name);

               instance->options.instance_name.str);

      current_node->restart_counter= 0;

      current_node->crash_moment= 0;

      current_node->state= STARTED;
@@ -169,7 +169,7 @@ void Guardian_thread::process_instance(Instance *instance, 
    switch (current_node->state) {

    case NOT_STARTED:

      log_info("guardian: starting instance %s",

               instance->options.instance_name);

               instance->options.instance_name.str);



      /* NOTE, set state to STARTING _before_ start() is called */

      current_node->state= STARTING;
@@ -194,7 +194,7 @@ void Guardian_thread::process_instance(Instance *instance, 
        {

          instance->start();

          log_info("guardian: starting instance %s",

                   instance->options.instance_name);

                   instance->options.instance_name.str);

        }

      }

      else
@@ -212,13 +212,13 @@ void Guardian_thread::process_instance(Instance *instance, 
            current_node->last_checked= current_time;

            current_node->restart_counter++;

            log_info("guardian: restarting instance %s",

                     instance->options.instance_name);

                     instance->options.instance_name.str);

          }

        }

        else

        {

          log_info("guardian: cannot start instance %s. Abandoning attempts "

                   "to (re)start it", instance->options.instance_name);

                   "to (re)start it", instance->options.instance_name.str);

          current_node->state= CRASHED_AND_ABANDONED;

        }

      }

server-tools/instance-manager/instance.cc

+5 −5
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int start_process(Instance_options *instance_options, 
    exit(1);

  case -1:

    log_info("cannot create a new process to start instance %s",

             instance_options->instance_name);

             instance_options->instance_name.str);

    return 1;

  }

  return 0;
@@ -311,9 +311,9 @@ void Instance::remove_pid() 
  int pid;

  if ((pid= options.get_pid()) != 0)          /* check the pidfile */

    if (options.unlink_pidfile())             /* remove stalled pidfile */

      log_error("cannot remove pidfile for instance %i, this might be \

                since IM lacks permmissions or hasn't found the pidifle",

                options.instance_name);

      log_error("cannot remove pidfile for instance %s, this might be "

                "since IM lacks permmissions or hasn't found the pidfile",

                options.instance_name.str);

}
@@ -619,7 +619,7 @@ void Instance::kill_instance(int signum) 
        log_error("The instance %s is being stopped forcibly. Normally" \

                  "it should not happen. Probably the instance has been" \

                  "hanging. You should also check your IM setup",

                  options.instance_name);

                  options.instance_name.str);

        /* After sucessful hard kill the pidfile need to be removed */

        options.unlink_pidfile();

      }