Commit 14f8d768 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-maint 

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


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
parents 77bae596 8f93a6c9

client/mysqltest.c

+1 −3
Original line number Diff line number Diff line
@@ -6456,7 +6456,7 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 
{

  my_regex_t r;

  my_regmatch_t *subs;

  char *buf_end, *replace_end;

  char *replace_end;

  char *buf= *buf_p;

  int len;

  int buf_len, need_buf_len;
@@ -6476,8 +6476,6 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern, 


  SECURE_REG_BUF



    buf_end= buf + buf_len;



  if (icase)

    cflags|= REG_ICASE;

mysql-test/lib/mtr_report.pl

+6 −1
Original line number Diff line number Diff line
@@ -34,7 +34,12 @@ sub mtr_verbose (@); 
# We can't use diff -u or diff -a as these are not portable



sub mtr_show_failed_diff ($) {

  my $tname=  shift;

  my $result_file_name=  shift;



  # The reject and log files have been dumped to

  # to filenames based on the result_file's name

  my $tname= basename($result_file_name);

  $tname=~ s/\..*$//;



  my $reject_file=  "r/$tname.reject";

  my $result_file=  "r/$tname.result";

mysql-test/mysql-test-run.pl

+6 −1
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ our $exe_mysqlslap; 
our $exe_mysqlimport;

our $exe_mysqlshow;

our $exe_mysql_fix_system_tables;

our $file_mysql_fix_privilege_tables;

our $exe_mysqltest;

our $exe_ndbd;

our $exe_ndb_mgmd;
@@ -1414,6 +1415,9 @@ sub executable_setup () { 
			"$path_client_bindir/mysql_fix_privilege_tables");

  }



  # Look for mysql_fix_privilege_tables.sql script

  $file_mysql_fix_privilege_tables=

    mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql");



  if ( ! $opt_skip_ndbcluster and executable_setup_ndb())

  {
@@ -1836,6 +1840,7 @@ sub environment_setup () { 
      "--socket=$master->[0]->{'path_sock'}";

    $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;

  }

  $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}=  $file_mysql_fix_privilege_tables;



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

  # Setup env so childs can execute my_print_defaults
@@ -3259,7 +3264,7 @@ sub report_failure_and_restart ($) { 
  my $tinfo= shift;



  mtr_report_test_failed($tinfo);

  mtr_show_failed_diff($tinfo->{'name'});

  mtr_show_failed_diff($tinfo->{'result_file'});

  print "\n";

  if ( $opt_force )

  {

mysql-test/t/system_mysql_db_fix.test→mysql-test/t/system_mysql_db_fix30020.test

+4 −2
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ 


#

# This is the test for mysql_fix_privilege_tables

# It checks that a system tables from mysql 3.20

# can be upgraded to current system table format

#

# Note: If this test fails, don't be confused about the errors reported

# by mysql-test-run; This shows warnings from generated by

# by mysql-test-run This shows warnings generated by

# mysql_fix_system_tables which should be ignored.

# Instead, concentrate on the errors in r/system_mysql_db.reject
@@ -85,7 +87,7 @@ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y',' 
INSERT INTO user VALUES ('localhost','',    '','N','N','N','N','N','N','N','N','N');



# Call the "shell script" $MYSQL_FIX_SYSTEM_TABLES using system

-- system $MYSQL_FIX_SYSTEM_TABLES --database=test > /dev/null

-- system $MYSQL_FIX_SYSTEM_TABLES --database=test > $MYSQLTEST_VARDIR/log/system_mysql_db_fix30020.log 2>&1

-- enable_query_log

-- enable_result_log