Commit 54e99aa5 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/default.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
parents bf0562f2 4efcca02

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ ndb/test/ndbapi/testNodeRestart 
ndb/test/ndbapi/testOIBasic

ndb/test/ndbapi/testOperations

ndb/test/ndbapi/testRestartGci

ndb/test/ndbapi/testSRBank

ndb/test/ndbapi/testScan

ndb/test/ndbapi/testScan.dsp

ndb/test/ndbapi/testScanInterpreter

extra/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h 
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid # innochecksum

			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html



# Don't update the files from bitkeeper

extra/innochecksum.c

+8 −4
Original line number Diff line number Diff line
@@ -140,10 +140,11 @@ int main(int argc, char **argv) { 
    int now; // current time

    int lastt; // last time

    ulint oldcsum, oldcsumfield, csum, csumfield, logseq, logseqfield; // ulints for checksum storage

    struct stat64 st; // for stat, if you couldn't guess

    struct stat st; // for stat, if you couldn't guess

    unsigned long long int size; // size of file (has to be 64 bits)

    ulint pages; // number of pages in file

    ulint start_page = 0, end_page = 0, use_end_page = 0; // for starting and ending at certain pages

    off_t offset = 0;

    int just_count = 0; // if true, just print page count

    int verbose = 0;

    int debug = 0;
@@ -202,7 +203,7 @@ int main(int argc, char **argv) { 
    }



    // stat the file to get size and page count

    if (stat64(argv[optind], &st)) {

    if (stat(argv[optind], &st)) {

        perror("error statting file");

        return 1;

    }
@@ -217,7 +218,7 @@ int main(int argc, char **argv) { 
    }



    // open the file for reading

    f = fopen64(argv[optind], "r");

    f = fopen(argv[optind], "r");

    if (!f) {

        perror("error opening file");

        return 1;
@@ -230,7 +231,10 @@ int main(int argc, char **argv) { 
            perror("unable to obtain file descriptor number");

            return 1;

        }

        if (lseek64(fd, start_page * UNIV_PAGE_SIZE, SEEK_SET) != (start_page * UNIV_PAGE_SIZE)) {



        offset = (off_t)start_page * (off_t)UNIV_PAGE_SIZE;



        if (lseek(fd, offset, SEEK_SET) != offset) {

            perror("unable to seek to necessary offset");

            return 1;

        }

mysql-test/mysql-test-run.pl

+6 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ our $exe_mysql_fix_system_tables; 
our $exe_mysqltest;

our $exe_slave_mysqld;

our $exe_im;

our $exe_my_print_defaults;



our $opt_bench= 0;

our $opt_small_bench= 0;
@@ -872,6 +873,8 @@ sub executable_setup () { 
    $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");

    $exe_mysql_fix_system_tables=

      mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");

    $exe_my_print_defaults=

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

    $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");

    $exe_ndb_mgm=        "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";

  }
@@ -887,6 +890,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_script_exists("path_client_bindir/my_print_defaults");



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

                                         "$glob_basedir/share/english/");
@@ -2384,6 +2389,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
@@ -575,6 +575,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/mysqltestmanagerc"

 MYSQL_MANAGER="$BASEDIR/tools/mysqltestmanager"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqltestmanager-pwgen"
@@ -635,6 +636,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/mysqltestmanager"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqltestmanagerc"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqltestmanager-pwgen"
@@ -716,7 +718,7 @@ MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR --charact 
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_SHOW 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