Commit 945625eb authored by unknown's avatar unknown
Browse files

manually merged 


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
parents 992ff0a2 0c6b9665

Build-tools/Bootstrap

+32 −12
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ else 
# Some predefined settings

$build_command= "BUILD/compile-pentium-max";

$PWD= cwd();

$LOGFILE= $PWD . "/Bootstrap.log";

$opt_docdir= $PWD . "/mysqldoc";

$opt_archive_log= undef;

$opt_build_command= undef;

$opt_changelog= undef;

$opt_delete= undef;
@@ -51,6 +51,7 @@ $version= "unknown"; 
$major=$minor=$release=0;



GetOptions(

  "archive-log|a",

	"build-command|b=s",

	"changelog|c:s",

	"directory|d=s",
@@ -72,6 +73,17 @@ GetOptions( 
        "quiet|q",

) || print_help("");



#

# Override predefined build command

#

if (defined $opt_build_command)

{

	$build_command= $opt_build_command;

}



print_help("") if ($opt_help);

defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");



#

# Override predefined Log file name

#
@@ -90,16 +102,7 @@ if (defined $opt_log) 
	}

}



#

# Override predefined build command

#

if (defined $opt_build_command)

{

	$build_command= $opt_build_command;

}



print_help("") if ($opt_help);

defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");

$LOGFILE= $PWD . "/Bootstrap-" . $REPO . ".log" unless ($LOGFILE);



&logger("Starting build");

&abort("The directory \"$REPO\" could not be found!") if (!-d $REPO);
@@ -351,6 +354,21 @@ if (!$opt_skip_check) 
# All done when we came down here

#

&logger("SUCCESS: Build finished successfully.") if (!$opt_dry_run);



#

# Move the log file into the Log dir of the target dir

#

if ($opt_archive_log)

{

  my $logdir= $target_dir . "/Logs";

  &logger("Moving $LOGFILE to $logdir");

  mkdir "$logdir" if (! -d $logdir);

  $command= "mv ";

  $command.= "-v " if ($opt_verbose || defined $opt_log);

  $command.= "$LOGFILE $logdir";

  &run_command($command, "Could not move $LOGFILE to $logdir!");

}



exit 0;



#
@@ -378,6 +396,8 @@ distribution check can be run before the source archive is being created. 


Options:



-a, --archive-log          Move the log file into the Logs directory of

                           the exported tree after a successful build

-b, --build-command=<cmd>  Use <cmd> to compile the sources before packing

                           the distribution.

                           (default is "$build_command")
@@ -398,7 +418,7 @@ Options: 
                           do not build or test the source distribution

-h, --help                 Print this help message

-l, --log[=<filename>]     Write a log file [to <filename>]

                           (default is "$LOGFILE")

                           (default is "./Bootstrap-<bk repository>.log")

-m, --mail=<address>       Mail a failure report to the given address (and

                           include a log file snippet, if logging is enabled)

                           Note that the \@-Sign needs to be quoted!

Build-tools/mysql-copyright

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ sub main 
    # on the toplevel of the directory instead. file 'PUBLIC' shouldn't

    # exist in the new mysql distributions, but let's be sure..

    unlink("$destdir/PUBLIC", "$destdir/README");

    unlink("$destdir/COPYING", "$destdir/EXCEPTIONS-CLIENT");

    copy("$WD/Docs/MySQLEULA.txt", "$destdir");



    # remove readline, bdb subdirs and update 'configure'

Docs/Makefile.am

+5 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \ 


all:			$(targets) txt_files



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

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

			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt



CLEAN_FILES:		$(BUILD_SOURCES)
@@ -204,7 +204,10 @@ INSTALL-BINARY: mysql.info $(GT) 
	perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@



../COPYING:		mysql.info $(GT)

	perl -w $(GT) mysql.info "GPL license" "Function Index" > $@

	perl -w $(GT) mysql.info "GPL license" "MySQL FLOSS License Exception" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
AUTOMAKE_OPTIONS =	foreign



# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE README COPYING

EXTRA_DIST =		INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack @sql_client_dirs@ \

VC++Files/sql/mysqld.dsp

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D LICENSE=Commercial /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D LICENSE=Commercial /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /D MYSQL_SERVER_SUFFIX=-classic /c

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe
@@ -243,7 +243,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D LICENSE=Commercial /D MYSQL_SERVER_SUFFIX=-nt /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /D LICENSE=Commercial /D MYSQL_SERVER_SUFFIX=-classic-nt /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"