Commit bf0a3bfc authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-slap


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
client/client_priv.h:
  WORKLOG #2983 - conflict hand-merge
parents 099d2bfb fbfb1956

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ \ 
                                $(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

				mysqldump mysqlimport mysqltest mysqlbinlog \

				mysqltestmanagerc mysqltestmanager-pwgen

				mysqltestmanagerc mysqltestmanager-pwgen \

				mysqlslap

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc
@@ -46,6 +47,7 @@ mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 
mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)

mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)

mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)

mysqlslap_SOURCES=              mysqlslap.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c $(yassl_dummy_link_fix)

mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,6 @@ enum options_client 
#endif

  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO

};

client/mysqlslap.c

0 → 100644
+1072 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/mysql-test-run.pl

+13 −2
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ our $exe_mysql_client_test; 
our $exe_mysqld;

our $exe_mysqlcheck;             # Called from test case

our $exe_mysqldump;              # Called from test case

our $exe_mysqlslap;              # Called from test case

our $exe_mysqlimport;              # Called from test case

our $exe_mysqlshow;              # Called from test case

our $exe_mysql_fix_system_tables;
@@ -961,6 +962,7 @@ sub executable_setup () { 
    }

    $exe_mysqlcheck=     mtr_exe_exists("$path_client_bindir/mysqlcheck");

    $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");

    $exe_mysqlslap=      mtr_exe_exists("$path_client_bindir/mysqlslap");

    $exe_mysqlimport=      mtr_exe_exists("$path_client_bindir/mysqlimport");

    $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");

    $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");
@@ -976,7 +978,7 @@ sub executable_setup () { 
    $path_client_bindir= mtr_path_exists("$glob_basedir/bin");

    $exe_mysqlcheck=     mtr_exe_exists("$path_client_bindir/mysqlcheck");

    $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");

    $exe_mysqlimport=    mtr_exe_exists("$path_client_bindir/mysqlimport");

    $exe_mysqlslap=      mtr_exe_exists("$path_client_bindir/mysqlslap");

    $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");

    $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");

    $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
@@ -2487,6 +2489,14 @@ sub run_mysqltest ($) { 
    $cmdline_mysqldump .=

      " --debug=d:t:A,$opt_vardir/log/mysqldump.trace";

  }

  my $cmdline_mysqlslap= "$exe_mysqlslap -uroot " .

                         "--port=$master->[0]->{'path_myport'} " .

                         "--socket=$master->[0]->{'path_mysock'} --password=";

  if ( $opt_debug )

  {

    $cmdline_mysqlslap .=

      " --debug=d:t:A,$opt_vardir/log/mysqldump.trace";

  }

  my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " .

                         "--port=$master->[0]->{'path_myport'} " .

                         "--socket=$master->[0]->{'path_mysock'} --password=";
@@ -2548,6 +2558,7 @@ sub run_mysqltest ($) { 
  $ENV{'MYSQL'}=                    $cmdline_mysql;

  $ENV{'MYSQL_CHECK'}=              $cmdline_mysqlcheck;

  $ENV{'MYSQL_DUMP'}=               $cmdline_mysqldump;

  $ENV{'MYSQL_SLAP'}=               $cmdline_mysqlslap;

  $ENV{'MYSQL_IMPORT'}=             $cmdline_mysqlimport;

  $ENV{'MYSQL_SHOW'}=               $cmdline_mysqlshow;

  $ENV{'MYSQL_BINLOG'}=             $cmdline_mysqlbinlog;

mysql-test/mysql-test-run.sh

+11 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ EXTRA_MASTER_OPT="" 
EXTRA_MYSQL_TEST_OPT=""

EXTRA_MYSQLCHECK_OPT=""

EXTRA_MYSQLDUMP_OPT=""

EXTRA_MYSQLSLAP_OPT=""

EXTRA_MYSQLSHOW_OPT=""

EXTRA_MYSQLBINLOG_OPT=""

USE_RUNNING_SERVER=0
@@ -519,6 +520,8 @@ while test $# -gt 0; do 
       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlcheck.trace"

      EXTRA_MYSQLDUMP_OPT="$EXTRA_MYSQLDUMP_OPT \

       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqldump.trace"

      EXTRA_MYSQLSLAP_OPT="$EXTRA_MYSQLSLAP_OPT \

       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlslap.trace"

      EXTRA_MYSQLSHOW_OPT="$EXTRA_MYSQLSHOW_OPT \

       --debug=d:t:A,$MYSQL_TEST_DIR/var/log/mysqlshow.trace"

      EXTRA_MYSQLBINLOG_OPT="$EXTRA_MYSQLBINLOG_OPT \
@@ -629,6 +632,11 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 else

   MYSQL_DUMP="$BASEDIR/client/mysqldump"

 fi

 if [ -f "$BASEDIR/client/.libs/mysqlslap" ] ; then

   MYSQL_SLAP="$BASEDIR/client/.libs/mysqlslap"

 else

   MYSQL_SLAP="$BASEDIR/client/mysqlslap"

 fi

 if [ -f "$BASEDIR/client/.libs/mysqlimport" ] ; then

   MYSQL_IMPORT="$BASEDIR/client/.libs/mysqlimport"

 else
@@ -709,6 +717,7 @@ else 
 MYSQL_TEST="$CLIENT_BINDIR/mysqltest"

 MYSQL_CHECK="$CLIENT_BINDIR/mysqlcheck"

 MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"

 MYSQL_SLAP="$CLIENT_BINDIR/mysqlslap"

 MYSQL_SHOW="$CLIENT_BINDIR/mysqlshow"

 MYSQL_IMPORT="$CLIENT_BINDIR/mysqlimport"

 MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
@@ -796,6 +805,7 @@ MYSQL_DUMP_DIR="$MYSQL_DUMP" 
export MYSQL_DUMP_DIR

MYSQL_CHECK="$MYSQL_CHECK --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLCHECK_OPT"

MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"

MYSQL_SLAP="$MYSQL_SLAP -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSLAP_OPT"

MYSQL_SHOW="$MYSQL_SHOW -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT"

MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR  --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_IMPORT="$MYSQL_IMPORT -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
@@ -803,6 +813,7 @@ MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost 
MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES MYSQL_IMPORT

export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR MYSQL_MY_PRINT_DEFAULTS

export MYSQL_SLAP

export NDB_TOOLS_DIR

export NDB_MGM

export NDB_BACKUP_DIR