Commit 44070705 authored by unknown's avatar unknown
Browse files

merge with 4.0 


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
  Auto merged
Docs/Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log.cc:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/mysqldump.c:
  merge with 4.0
  (This only reorders options)
sql/ha_innodb.cc:
  merge with 4.0 (Keep original code)
sql/time.cc:
  Note that part of this patch is done in my_time.c
parents 6a1bc4a5 b19eb67f

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ tim@bitch.mysql.fi 
tim@black.box

tim@hundin.mysql.fi

tim@sand.box

tim@siva.hindu.god

tim@threads.polyesthetic.msg

tim@white.box

tim@work.mysql.com

Build-tools/Bootstrap

+4 −0
Original line number Diff line number Diff line
@@ -288,6 +288,10 @@ unless ($opt_skip_manual) 
		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0

		or &abort("Could not update $file.texi in $target_dir/Docs/!");

	}

        system ("rm -f $target_dir/Docs/Images/Makefile*") == 0

        or &abort("Could not remove Makefiles in $target_dir/Docs/Images/!");

        system ("cp $opt_docdir/Docs/Images/*.* $target_dir/Docs/Images") == 0

        or &abort("Could not copy image files in $target_dir/Docs/Images/!");

}



#

Docs/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ BUILT_SOURCES = $(targets) manual_toc.html include.texi 
EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \

			INSTALL-BINARY reservedwords.texi internals.texi



SUBDIRS =		Images



all:			$(targets) txt_files



txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \

client/mysqldump.c

+25 −28
Original line number Diff line number Diff line
@@ -259,19 +259,6 @@ static struct my_option my_long_options[] = 
   "Wrap tables with autocommit/commit statements.",

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

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

  /*

    Note that the combination --single-transaction --master-data

    will give bullet-proof binlog position only if server >=4.1.3. That's the

    old "FLUSH TABLES WITH READ LOCK does not block commit" fixed bug.

  */

  {"single-transaction", OPT_TRANSACTION,

   "Creates a consistent snapshot by dumping all tables in a single "

   "transaction. Works ONLY for tables stored in storage engines which "

   "support multiversioning (currently only InnoDB does); the dump is NOT "

   "guaranteed to be consistent for other storage engines. Option "

   "automatically turns off --lock-tables.",

   (gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0,

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

  {"no-create-db", 'n',

   "'CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;' will not be put in the output. The above line will be added otherwise, if --databases or --all-databases option was given.}.",

   (gptr*) &opt_create_db, (gptr*) &opt_create_db, 0, GET_BOOL, NO_ARG, 0, 0,
@@ -283,13 +270,6 @@ static struct my_option my_long_options[] = 
  {"no-set-names", 'N',

   "Deprecated. Use --skip-set-charset instead.",

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

  {"set-charset", OPT_SET_CHARSET,

   "Add 'SET NAMES default_character_set' to the output. Enabled by default; suppress with --skip-set-charset.",

   (gptr*) &opt_set_charset, (gptr*) &opt_set_charset, 0, GET_BOOL, NO_ARG, 1,

   0, 0, 0, 0, 0},

  {"set-variable", 'O',

   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"opt", OPT_OPTIMIZE,

   "Same as --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys. Enabled by default, disable with --skip-opt.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -313,11 +293,31 @@ static struct my_option my_long_options[] = 
  {"result-file", 'r',

   "Direct output to a given file. This option should be used in MSDOS, because it prevents new line '\\n' from being converted to '\\r\\n' (carriage return + line feed).",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"set-charset", OPT_SET_CHARSET,

   "Add 'SET NAMES default_character_set' to the output. Enabled by default; suppress with --skip-set-charset.",

   (gptr*) &opt_set_charset, (gptr*) &opt_set_charset, 0, GET_BOOL, NO_ARG, 1,

   0, 0, 0, 0, 0},

  {"set-variable", 'O',

   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#ifdef HAVE_SMEM

  {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,

   "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name,

   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

  /*

    Note that the combination --single-transaction --master-data

    will give bullet-proof binlog position only if server >=4.1.3. That's the

    old "FLUSH TABLES WITH READ LOCK does not block commit" fixed bug.

  */

  {"single-transaction", OPT_TRANSACTION,

   "Creates a consistent snapshot by dumping all tables in a single "

   "transaction. Works ONLY for tables stored in storage engines which "

   "support multiversioning (currently only InnoDB does); the dump is NOT "

   "guaranteed to be consistent for other storage engines. Option "

   "automatically turns off --lock-tables.",

   (gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0,

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

  {"skip-opt", OPT_SKIP_OPTIMIZATION,

   "Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -1677,16 +1677,13 @@ static void dumpTable(uint numFields, char *table) 
		fputs("</field>\n", md_result_file);

	      }

	      else if (opt_hex_blob && is_blob)

              { /* sakaik got this idea. */

              {

                /* sakaik got the idea to to provide blob's in hex notation. */

                ulong counter;

                char xx[4];

                unsigned char *ptr= row[i];

                unsigned char *ptr= row[i], *end= ptr+ lengths[i];

                fputs("0x", md_result_file);

                for (counter = 0; counter < lengths[i]; counter++)

                {

                  sprintf(xx, "%02X", ptr[counter]);

                  fputs(xx, md_result_file);

                }

                for (; ptr < end ; ptr++)

                  fprintf(md_result_file, "%02X", *ptr);

              }

              else

                unescape(md_result_file, row[i], lengths[i]);

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null 
then

  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"

# Solaris

elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null

elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"

# BSD style
@@ -3149,7 +3149,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl 
 sql-common/Makefile SSL/Makefile dnl

 dbug/Makefile scripts/Makefile dnl

 include/Makefile sql-bench/Makefile tools/Makefile dnl

 tests/Makefile Docs/Makefile support-files/Makefile dnl

 tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl

 support-files/MacOSX/Makefile mysql-test/Makefile dnl

 netware/Makefile dnl

 include/mysql_version.h dnl