Commit 625e5824 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
parents 9636f9ed eecb7c94

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.20)

AM_INIT_AUTOMAKE(mysql, 4.1.21)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=20

NDB_VERSION_BUILD=21

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/mysql-test-run.pl

+8 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ our $exe_mysqlshow; # Called from test case 
our $exe_mysql_fix_system_tables;

our $exe_mysqltest;

our $exe_slave_mysqld;

our $exe_my_print_defaults;



our $opt_bench= 0;

our $opt_small_bench= 0;
@@ -894,6 +895,8 @@ sub executable_setup () { 
                                           "$path_client_bindir/mysqld-max");

      $path_language=      mtr_path_exists("$glob_basedir/share/english/");

      $path_charsetsdir=   mtr_path_exists("$glob_basedir/share/charsets");

      $exe_my_print_defaults=

	mtr_exe_exists("$path_client_bindir/my_print_defaults");

    }

    else

    {
@@ -901,6 +904,8 @@ sub executable_setup () { 
      $exe_mysqld=         mtr_exe_exists ("$glob_basedir/sql/mysqld");

      $path_language=      mtr_path_exists("$glob_basedir/sql/share/english/");

      $path_charsetsdir=   mtr_path_exists("$glob_basedir/sql/share/charsets");

      $exe_my_print_defaults=

	mtr_exe_exists("$glob_basedir/extra/my_print_defaults");

    }



    if ( $glob_use_embedded_server )
@@ -953,6 +958,8 @@ sub executable_setup () { 
    $exe_mysql_fix_system_tables=

      mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",

			"$glob_basedir/scripts/mysql_fix_privilege_tables");

    $exe_my_print_defaults=

      mtr_exe_exists("$path_client_bindir/my_print_defaults");



    $path_language=      mtr_path_exists("$glob_basedir/share/mysql/english/",

                                         "$glob_basedir/share/english/");
@@ -2304,6 +2311,7 @@ sub run_mysqltest ($) { 
  $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;

  $ENV{'MYSQL_CLIENT_TEST'}=        $cmdline_mysql_client_test;

  $ENV{'CHARSETSDIR'}=              $path_charsetsdir;

  $ENV{'MYSQL_MY_PRINT_DEFAULTS'}=  $exe_my_print_defaults;



  $ENV{'NDB_STATUS_OK'}=            $flag_ndb_status_ok;

  $ENV{'NDB_MGM'}=                  $exe_ndb_mgm;

mysql-test/mysql-test-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 CLIENT_BINDIR="$BASEDIR/client"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$BASEDIR/extra/mysql_waitpid"

 MYSQL_MY_PRINT_DEFAULTS="$BASEDIR/extra/my_print_defaults"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"

 MYSQL_MANAGER="$BASEDIR/tools/mysqlmanager"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"
@@ -662,6 +663,7 @@ else 
 MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$CLIENT_BINDIR/mysql_waitpid"

 MYSQL_MY_PRINT_DEFAULTS="$CLIENT_BINDIR/my_print_defaults"

 MYSQL_MANAGER="$CLIENT_BINDIR/mysqlmanager"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"
@@ -743,7 +745,7 @@ MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYS 
MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"

MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

export MYSQL MYSQL_DUMP MYSQL_IMPORT MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES

export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR

export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR MYSQL_MY_PRINT_DEFAULTS

export NDB_TOOLS_DIR

export NDB_MGM

export NDB_BACKUP_DIR

mysql-test/r/mysqldump.result

+1 −0
Original line number Diff line number Diff line
@@ -1503,6 +1503,7 @@ select * from t1; 
a	b

Osnabrck	Kln

drop table t1;

--fields-optionally-enclosed-by="

create table `t1` (

t1_name varchar(255) default null,

t1_id int(10) unsigned not null auto_increment,

mysql-test/std_data/bug15328.cnf

0 → 100644
+2 −0
Original line number Diff line number Diff line 
[mysqldump]

fields-optionally-enclosed-by="