Commit 7b0069ee authored by unknown's avatar unknown
Browse files

merged 


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged
parents 15092975 a3740c88

.bzrignore

+16 −2
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Makefile.in 
Makefile.in'

PENDING/*

TAGS

ac_available_languages_fragment

aclocal.m4

autom4te-2.53.cache/*

autom4te-2.53.cache/output.0
@@ -315,6 +316,7 @@ gmon.out 
hardcopy.0

heap/hp_test1

heap/hp_test2

help

help.c

help.h

include/my_config.h
@@ -756,11 +758,25 @@ ndb/tools/ndb_delete_all 
ndb/tools/ndb_desc

ndb/tools/ndb_drop_index

ndb/tools/ndb_drop_table

ndb/tools/ndb_restore

ndb/tools/ndb_select_all

ndb/tools/ndb_select_count

ndb/tools/ndb_show_tables

ndb/tools/ndb_test_platform

ndb/tools/ndb_waiter

ndbcluster-1186

ndbcluster-1186/SCCS

ndbcluster-1186/config.ini

ndbcluster-1186/ndb_1.pid

ndbcluster-1186/ndb_1_out.log

ndbcluster-1186/ndb_1_signal.log

ndbcluster-1186/ndb_2.pid

ndbcluster-1186/ndb_2_out.log

ndbcluster-1186/ndb_2_signal.log

ndbcluster-1186/ndb_3.pid

ndbcluster-1186/ndb_3_cluster.log

ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

pull.log

regex/re

repl-tests/test-repl-ts/repl-timestamp.master.reject
@@ -959,5 +975,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
ac_available_languages_fragment

ndb/tools/ndb_restore

client/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				@ndb_mgmclient_libs@ \

				../libmysql/libmysqlclient.la

DEPLIB=				../libmysql/libmysqlclient.la

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

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

				client_priv.h

mysqladmin_SOURCES =		mysqladmin.cc

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

client/mysqladmin.c→client/mysqladmin.cc

+6 −9
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <sys/stat.h>

#include <mysql.h>



#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

#include "../ndb/src/mgmclient/ndb_mgmclient.h"

#endif
@@ -45,7 +45,7 @@ static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations, 
            opt_count_iterations= 0;

static ulong opt_connect_timeout, opt_shutdown_timeout;

static my_string unix_port=0;

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

static my_bool opt_ndbcluster=0;

static char *opt_ndb_connectstring=0;

#endif
@@ -101,7 +101,7 @@ enum commands { 
  ADMIN_PING,             ADMIN_EXTENDED_STATUS, ADMIN_FLUSH_STATUS,

  ADMIN_FLUSH_PRIVILEGES, ADMIN_START_SLAVE,     ADMIN_STOP_SLAVE,

  ADMIN_FLUSH_THREADS,    ADMIN_OLD_PASSWORD

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

  ,ADMIN_NDB_MGM

#endif

};
@@ -114,7 +114,7 @@ static const char *command_names[]= { 
  "ping",                 "extended-status",     "flush-status",

  "flush-privileges",     "start-slave",         "stop-slave",

  "flush-threads","old-password",

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

  "ndb-mgm",

#endif

  NullS
@@ -197,7 +197,7 @@ static struct my_option my_long_options[] = 
  {"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", (gptr*) &opt_shutdown_timeout,

   (gptr*) &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,

   SHUTDOWN_DEF_TIMEOUT, 0, 3600*12, 0, 1, 0},

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

  {"ndbcluster", OPT_NDBCLUSTER, ""

   "", (gptr*) &opt_ndbcluster,

   (gptr*) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -903,7 +903,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      }

      mysql->reconnect=1;	/* Automatic reconnect is default */

      break;

#ifdef HAVE_NDBCLUSTER_DB

#ifdef LATER_HAVE_NDBCLUSTER_DB

    case ADMIN_NDB_MGM:

    {

      if (argc < 2)
@@ -1287,9 +1287,6 @@ static my_bool wait_pidfile(char *pidfile, time_t last_modified, 
  }

  DBUG_RETURN(error);

}

#ifdef HAVE_NDBCLUSTER_DB

/* lib linked in contains c++ code */

#ifdef __GNUC__

FIX_GCC_LINKING_PROBLEM

#endif
 
#endif

client/mysqlbinlog.cc

+16 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static const char *load_default_groups[]= { "mysqlbinlog","client",0 }; 


void sql_print_error(const char *format, ...);



static bool one_database=0, to_last_remote_log= 0;

static bool one_database=0, to_last_remote_log= 0, disable_log_bin= 0;

static const char* database= 0;

static my_bool force_opt= 0, short_form= 0, remote_opt= 0;

static ulonglong offset = 0;
@@ -495,6 +495,13 @@ static struct my_option my_long_options[] = 
  {"database", 'd', "List entries for just this database (local log only).",

   (gptr*) &database, (gptr*) &database, 0, GET_STR_ALLOC, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"disable-log-bin", 'D', "Disable binary log. This is useful, if you "

    "enabled --to-last-log and are sending the output to the same MySQL server. "

    "This way you could avoid an endless loop. You would also like to use it "

    "when restoring after a crash to avoid duplication of the statements you "

    "already have. NOTE: you will need a SUPER privilege to use this option.",

   (gptr*) &disable_log_bin, (gptr*) &disable_log_bin, 0, GET_BOOL,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"force-read", 'f', "Force reading unknown binlog events.",

   (gptr*) &force_opt, (gptr*) &force_opt, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},
@@ -1218,6 +1225,11 @@ int main(int argc, char** argv) 


  fprintf(result_file,

	  "/*!40019 SET @@session.max_insert_delayed_threads=0*/;\n");



  if (disable_log_bin)

    fprintf(result_file,

            "/*!32316 SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0*/;\n");



  for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;

       (--argc >= 0) && !stop_passed ; )

  {
@@ -1232,6 +1244,9 @@ int main(int argc, char** argv) 
    start_position= BIN_LOG_HEADER_SIZE;

  }



  if (disable_log_bin)

    fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");



  if (tmpdir.list)

    free_tmpdir(&tmpdir);

  if (result_file != stdout)

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ then 
  then

    if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1

    then

      CFLAGS="$CFLAGS -DDEFINE_CXA_PURE_VIRTUAL"

      CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"

    fi

  fi