Commit 4991cc07 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_mgm.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 22d76f5a 5d58edf0

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ mysql-test/*.ds? 
mysql-test/*.vcproj

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new
@@ -1170,6 +1171,7 @@ sql/*.ds? 
sql/*.vcproj

sql/.gdbinit

sql/client.c

sql/f.c

sql/gen_lex_hash

sql/gmon.out

sql/handlerton.cc

BUILD/SETUP.sh

+3 −9
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ parse_options() 


########################################################################



if ! test -f sql/mysqld.cc

if test ! -f sql/mysqld.cc

then

  echo "You must run this script from the MySQL top-level directory"

  exit 1
@@ -185,12 +185,6 @@ fi 
# (returns 0 if finds lines)

if ccache -V > /dev/null 2>&1

then

  if ! (echo "$CC" | grep "ccache" > /dev/null)

  then

    CC="ccache $CC"

  fi

  if ! (echo "$CXX" | grep "ccache" > /dev/null)

  then

    CXX="ccache $CXX"

  fi

  echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"

  echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"

fi

BUILD/check-cpu

+185 −182
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
# Check cpu of current machine and find the

# best compiler optimization flags for gcc

#

#



check_cpu () {

  if test -r /proc/cpuinfo ; then

    # on Linux (and others?) we can get detailed CPU information out of /proc

    cpuinfo="cat /proc/cpuinfo"
@@ -117,7 +117,7 @@ esac 




  if test -z "$cpu_arg"; then

  echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using."

    echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2

    check_cpu_cflags=""

    return

  fi
@@ -173,16 +173,17 @@ esac 
  touch __test.c



  while [ "$cpu_arg" ] ; do

  echo -n testing $cpu_arg "... "

    # FIXME: echo -n isn't portable - see contortions autoconf goes through

    echo -n testing $cpu_arg "... " >&2

          

    # compile check

    check_cpu_cflags=`eval echo $check_cpu_args`

    if $cc -c $check_cpu_cflags __test.c 2>/dev/null; then

	  echo ok

            echo ok >&2

        break;

    fi



  echo failed

    echo failed >&2

    check_cpu_cflags=""



    # if compile failed: check whether it supports a predecessor of this CPU
@@ -208,4 +209,6 @@ while [ "$cpu_arg" ] ; do 
  done



  rm __test.*

}

 

check_cpu

client/mysql.cc

+5 −33
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void end_timer(ulong start_time,char *buff); 
static void mysql_end_timer(ulong start_time,char *buff);

static void nice_time(double sec,char *buff,bool part_second);

static sig_handler mysql_end(int sig);

static sig_handler mysql_sigint(int sig);

static sig_handler handle_sigint(int sig);



int main(int argc,char *argv[])

{
@@ -420,8 +420,7 @@ int main(int argc,char *argv[]) 
  if (opt_sigint_ignore)

    signal(SIGINT, SIG_IGN);

  else

    signal(SIGINT, mysql_sigint);		// Catch SIGINT to clean up



    signal(SIGINT, handle_sigint);              // Catch SIGINT to clean up

  signal(SIGQUIT, mysql_end);			// Catch SIGQUIT to clean up



  /*
@@ -489,28 +488,6 @@ int main(int argc,char *argv[]) 
#endif

}



sig_handler mysql_sigint(int sig)

{

  char kill_buffer[40];

  MYSQL *kill_mysql= NULL;



  signal(SIGINT, mysql_sigint);



  /* terminate if no query being executed, or we already tried interrupting */

  if (!executing_query || interrupted_query++)

    mysql_end(sig);



  kill_mysql= mysql_init(kill_mysql);

  if (!mysql_real_connect(kill_mysql,current_host, current_user, opt_password,

                          "", opt_mysql_port, opt_mysql_unix_port,0))

    mysql_end(sig);

  /* kill_buffer is always big enough because max length of %lu is 15 */

  sprintf(kill_buffer, "KILL /*!50000 QUERY */ %lu", mysql_thread_id(&mysql));

  mysql_real_query(kill_mysql, kill_buffer, strlen(kill_buffer));

  mysql_close(kill_mysql);

  tee_fprintf(stdout, "Query aborted by Ctrl+C\n");

}



sig_handler mysql_end(int sig)

{

  mysql_close(&mysql);
@@ -1058,8 +1035,6 @@ static int read_and_execute(bool interactive) 
      if (opt_outfile && glob_buffer.is_empty())

	fflush(OUTFILE);



      interrupted_query= 0;



#if defined( __WIN__) || defined(__NETWARE__)

      tee_fputs(prompt, stdout);

#if defined(__NETWARE__)
@@ -1982,6 +1957,9 @@ com_charset(String *buffer __attribute__((unused)), char *line) 
  if (new_cs)

  {

    charset_info= new_cs;

    mysql_set_character_set(&mysql, charset_info->csname);

    default_charset= (char *)charset_info->csname;

    default_charset_used= 1;

    put_info("Charset changed", INFO_INFO);

  }

  else put_info("Charset is not found", INFO_INFO);
@@ -2041,9 +2019,7 @@ com_go(String *buffer,char *line __attribute__((unused))) 
  }



  timer=start_timer();



  executing_query= 1;



  error= mysql_real_query_for_lazy(buffer->ptr(),buffer->length());



#ifdef HAVE_READLINE
@@ -2059,7 +2035,6 @@ com_go(String *buffer,char *line __attribute__((unused))) 
  {

    executing_query= 0;

    buffer->length(0); // Remove query on error

    executing_query= 0;

    return error;

  }

  error=0;
@@ -2143,9 +2118,6 @@ com_go(String *buffer,char *line __attribute__((unused))) 
      fflush(stdout);

    mysql_free_result(result);

  } while (!(err= mysql_next_result(&mysql)));



  executing_query= 0;



  if (err >= 1)

    error= put_error(&mysql);

client/mysql_upgrade.c

+14 −2
Original line number Diff line number Diff line
@@ -157,17 +157,29 @@ static int create_defaults_file(const char *path, const char *our_defaults_path) 
  File our_defaults_file, defaults_file;

  char buffer[512];

  char *buffer_end;

  int failed_to_open_count= 0;

  int error;



  /* check if the defaults file is needed at all */

  if (!opt_password)

    return 0;



  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,

retry_open:

  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY | O_EXCL,

                         MYF(MY_FAE | MY_WME));



  if (defaults_file < 0)

  {

    if (failed_to_open_count == 0)

    {

      remove(path);

      failed_to_open_count+= 1;

      goto retry_open;

    }

    else

      return 1;

  }



  upgrade_defaults_created= 1;

  if (our_defaults_path)

  {