Commit 04da114c authored by unknown's avatar unknown
Browse files

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/r/archive.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
parents af23ddf6 10f4f15e

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ fi 
# (http://samba.org/ccache) is installed, use it.

# We use 'grep' and hope 'grep' will work as expected

# (returns 0 if finds lines)

if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" == "1"

if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1"

then

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

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

BUILD/check-cpu

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ check_cpu () { 
    fi



    # parse CPU flags

    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do 

    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do 

          eval cpu_flag_$flag=yes

    done

  else

BitKeeper/etc/collapsed

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454bb488ijVLOUK_GFjcoISE0GxPUA

454bb9a8AwlGRC_wWLS2sNMoRBMRGw
@@ -30,3 +32,5 @@ 
4561b2ecZbhuAc0TTDdCdultxUYaMw

4561bde4qWhz1I8tkItXKex5uniipA

4562ba016dYH0JzszOqZ8p6psbKfnQ

45771031yRCoM_ZfONdYchPvVEgLRg

45ae6628gqKTsUFfnoNExadETVIkbA

Makefile.am

+9 −7
Original line number Diff line number Diff line
@@ -102,8 +102,10 @@ dist-hook: 
tags:

	support-files/build-tags



.PHONY:	init-db bin-dist test test-full test-ps test-nr \

	test-ns test-pr test-unit

.PHONY:	init-db bin-dist \

  test    test-force    test-full    test-force-full    test-force-mem \

  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \

  test-unit test-ps test-nr test-pr test-ns test-binlog-statement



# Target 'test' will run the regression test suite using the built server.

#
@@ -118,23 +120,23 @@ test-unit: 


test-ps:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed



test-nr:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=row

	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row



test-pr:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row



test-ns:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed

	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed



test-binlog-statement:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement

	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement



test:	test-unit test-ns test-pr

client/mysql_upgrade.c

+57 −20
Original line number Diff line number Diff line
@@ -470,7 +470,12 @@ int main(int argc, char **argv) 
  

  load_defaults("my", load_default_groups, &argc, &argv);



  if (handle_options(&argc, &argv, my_long_options, get_one_option)) 

  /* 

     Must init_dynamic_string before handle_options because string is freed

     at error label.

   */

  if (init_dynamic_string(&cmdline, NULL, 2 * FN_REFLEN + 128, FN_REFLEN) ||

      handle_options(&argc, &argv, my_long_options, get_one_option))

  {

    ret= 1;

    goto error;
@@ -478,11 +483,6 @@ int main(int argc, char **argv) 
  if (tty_password)

    opt_password= get_tty_password(NullS);



  if (init_dynamic_string(&cmdline, NULL, 2 * FN_REFLEN + 128, FN_REFLEN))

  {

    ret= 1;

    goto error;

  }

  if (!basedir)

  {

    my_getwd(path, sizeof(path), MYF(0));
@@ -565,17 +565,34 @@ int main(int argc, char **argv) 
     goto error;

  }

  else

    dynstr_set(&cmdline, path);

  {

#ifdef __WIN__

    /* Windows requires an extra pair of quotes around the entire string. */

    dynstr_set(&cmdline, "\""); 

#else

    dynstr_set(&cmdline, "");

#endif /* __WIN__ */

    dynstr_append_os_quoted(&cmdline, path, NullS);

  }



  if (defaults_to_use)

  {

    dynstr_append(&cmdline, " --defaults-extra-file=");

    dynstr_append(&cmdline, defaults_to_use);

    dynstr_append(&cmdline, " ");

    dynstr_append_os_quoted(&cmdline, "--defaults-extra-file=", 

                            defaults_to_use, NullS);

  }



  dynstr_append(&cmdline, " --check-upgrade --all-databases"

                 " --auto-repair --user=");

  dynstr_append(&cmdline, user);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--check-upgrade", NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--all-databases", NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--auto-repair", NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--user=", user, NullS);

#ifdef __WIN__

  dynstr_append(&cmdline, "\"");

#endif /* __WIN__ */



  if (opt_verbose)

    printf("Running %s\n", cmdline.str);
@@ -604,7 +621,15 @@ int main(int argc, char **argv) 
    goto error;

  }

  else

    dynstr_set(&cmdline, path);

  {

#ifdef __WIN__

    /* Windows requires an extra pair of quotes around the entire string. */

    dynstr_set(&cmdline, "\"");

#else

    dynstr_set(&cmdline, "");

#endif /* __WIN__ */

    dynstr_append_os_quoted(&cmdline, path, NullS);

  }



  if (find_file(MYSQL_FIX_PRIV_TABLES_NAME, basedir, MYF(0), 

                          path, sizeof(path),
@@ -626,13 +651,25 @@ int main(int argc, char **argv) 


  if (defaults_to_use)

  {

    dynstr_append(&cmdline, " --defaults-extra-file=");

    dynstr_append(&cmdline, defaults_to_use);

  }

  dynstr_append(&cmdline, " --force --no-auto-rehash --batch --user=");

  dynstr_append(&cmdline, user);

  dynstr_append(&cmdline, " mysql < ");

  dynstr_append(&cmdline, script_line);

    dynstr_append(&cmdline, " ");

    dynstr_append_os_quoted(&cmdline, "--defaults-extra-file=", 

                            defaults_to_use, NullS);

  }

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--force", NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--no-auto-rehash", NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--batch", NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--user=", user, NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--database=mysql", NullS);

  dynstr_append(&cmdline, " < ");

  dynstr_append_os_quoted(&cmdline, script_line, NullS);

#ifdef __WIN__

  dynstr_append(&cmdline, "\"");

#endif /* __WIN__ */



  if (opt_verbose)

    printf("Running %s\n", cmdline.str);