diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 40 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 8 | ||||
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 9 |
5 files changed, 44 insertions, 18 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index cf061cc08e5..ac43bb7b0a4 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -92,6 +92,8 @@ CLEANFILES = @server_scripts@ \ mysqldumpslow \ mysqld_multi +pkgplugindir = $(pkglibdir)/plugin + # Default same as 'pkgdatadir', but we can override it pkgsuppdir = $(datadir)/@PACKAGE@ @@ -139,6 +141,7 @@ SUFFIXES = .sh -e 's!@''pkglibdir''@!$(pkglibdir)!g' \ -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \ -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \ + -e 's!@''pkgplugindir''@!$(pkgplugindir)!g' \ -e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \ -e 's!@''sysconfdir''@!$(sysconfdir)!g' \ -e 's!@''mandir''@!$(mandir)!g' \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 17d5c6ebbaf..0a58f8b8ef1 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -31,6 +31,7 @@ # "pkglibdir" is set to the same as "libdir" # "pkgincludedir" is set to the same as "includedir" # "pkgdatadir" is set to the same as "datadir" +# "pkgplugindir" is set to "$pkglibdir/plugin" # "pkgsuppdir" is set to "@prefix@/support-files", # normally the same as "datadir" # @@ -205,6 +206,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then pkglibdir=@pkglibdir@ \ pkgincludedir=@pkgincludedir@ \ pkgdatadir=@pkgdatadir@ \ + pkgplugindir=@pkgplugindir@ \ pkgsuppdir=@pkgsuppdir@ \ mandir=@mandir@ \ infodir=@infodir@ diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index f0dc3eff72b..5eb5a5643f1 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -26,8 +26,7 @@ set -e # NOTE: Pattern matching with "{..,..}" can't be used, not portable. # ---------------------------------------------------------------------- -# FIXME FIXME "debug", own build or handled here? -# FIXME FIXME add way to copy from other builds executables +# FIXME why "libmysql.dll" installed both in "bin" and "lib/opt"? usage() { @@ -150,13 +149,16 @@ cp storage/myisam/$TARGET/*.exe $DESTDIR/bin/ cp server-tools/instance-manager/$TARGET/*.{exe,map} $DESTDIR/bin/ if [ x"$TARGET" != x"release" ] ; then cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/ + cp client/$TARGET/mysql.pdb $DESTDIR/bin/ + cp client/$TARGET/mysqladmin.pdb $DESTDIR/bin/ + cp client/$TARGET/mysqlbinlog.pdb $DESTDIR/bin/ + cp client/$TARGET/mysqldump.pdb $DESTDIR/bin/ + cp client/$TARGET/mysqlimport.pdb $DESTDIR/bin/ + cp client/$TARGET/mysqlshow.pdb $DESTDIR/bin/ fi cp tests/$TARGET/*.exe $DESTDIR/bin/ cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/ -# FIXME really needed?! -mv $DESTDIR/bin/comp_err.exe $DESTDIR/bin/comp-err.exe - cp sql/$TARGET/mysqld.exe $DESTDIR/bin/mysqld$EXE_SUFFIX.exe cp sql/$TARGET/mysqld.map $DESTDIR/bin/mysqld$EXE_SUFFIX.map if [ x"$TARGET" != x"release" ] ; then @@ -178,10 +180,6 @@ if [ -d win/data ] ; then cp -pR win/data $DESTDIR/ fi -# FIXME maybe a flag to define "release build", or do the -# check from the calling script that all these are there, -# and with the correct content. - mkdir $DESTDIR/Docs cp Docs/INSTALL-BINARY $DESTDIR/Docs/ cp Docs/manual.chm $DESTDIR/Docs/ || /bin/true @@ -205,11 +203,13 @@ copy_embedded() $DESTDIR/include cp libmysqld/libmysqld.def $DESTDIR/include/ cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/ - cp libmysqld/$TARGET/mysqlserver.pdb $DESTDIR/Embedded/static/release/ cp libmysqld/$TARGET/libmysqld.dll $DESTDIR/Embedded/DLL/release/ cp libmysqld/$TARGET/libmysqld.exp $DESTDIR/Embedded/DLL/release/ cp libmysqld/$TARGET/libmysqld.lib $DESTDIR/Embedded/DLL/release/ - cp libmysqld/$TARGET/libmysqld.pdb $DESTDIR/Embedded/DLL/release/ + if [ x"$TARGET" != x"release" ] ; then + cp libmysqld/$TARGET/mysqlserver.pdb $DESTDIR/Embedded/static/release/ + cp libmysqld/$TARGET/libmysqld.pdb $DESTDIR/Embedded/DLL/release/ + fi if [ x"$PACK_DEBUG" = x"" -a -f "libmysqld/debug/libmysqld.lib" -o \ x"$PACK_DEBUG" = x"yes" ] ; then @@ -276,7 +276,6 @@ cp include/mysql/plugin.h $DESTDIR/include/mysql/ # ---------------------------------------------------------------------- # Client libraries, and other libraries -# FIXME why "libmysql.dll" installed both in "bin" and "lib/opt"? # ---------------------------------------------------------------------- mkdir -p $DESTDIR/lib/opt @@ -288,16 +287,31 @@ cp libmysql/$TARGET/libmysql.dll \ strings/$TARGET/strings.lib \ zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/ +if [ x"$TARGET" != x"release" ] ; then + cp libmysql/$TARGET/libmysql.pdb \ + libmysql/$TARGET/mysqlclient.pdb \ + mysys/$TARGET/mysys.pdb \ + regex/$TARGET/regex.pdb \ + strings/$TARGET/strings.pdb \ + zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/ +fi + if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \ x"$PACK_DEBUG" = x"yes" ] ; then mkdir -p $DESTDIR/lib/debug cp libmysql/debug/libmysql.dll \ libmysql/debug/libmysql.lib \ + libmysql/debug/libmysql.pdb \ libmysql/debug/mysqlclient.lib \ + libmysql/debug/mysqlclient.pdb \ mysys/debug/mysys.lib \ + mysys/debug/mysys.pdb \ regex/debug/regex.lib \ + regex/debug/regex.pdb \ strings/debug/strings.lib \ - zlib/debug/zlib.lib $DESTDIR/lib/debug/ + strings/debug/strings.pdb \ + zlib/debug/zlib.lib \ + zlib/debug/zlib.pdb $DESTDIR/lib/debug/ fi # ---------------------------------------------------------------------- diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 8abad75bc2a..c16d9bb62e5 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -87,6 +87,8 @@ pkglibdir='@pkglibdir@' pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` fix_path pkglibdir $pkglibdir_rel lib/mysql lib +plugindir='@pkgplugindir@' + pkgincludedir='@pkgincludedir@' fix_path pkgincludedir include/mysql include @@ -123,11 +125,13 @@ include="-I$pkgincludedir" # Remove some options that a client doesn't have to care about # FIXME until we have a --cxxflags, we need to remove -Xa # and -xstrconst to make --cflags usable for Sun Forte C++ +# FIXME until we have a --cxxflags, we need to remove -AC99 +# to make --cflags usable for HP C++ (aCC) for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \ DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \ - Xa xstrconst "xc99=none" \ + Xa xstrconst "xc99=none" AC99 \ unroll2 ip mp restrict do # The first option we might strip will always have a space before it because @@ -158,6 +162,7 @@ Options: --include [$include] --libs [$libs] --libs_r [$libs_r] + --plugindir [$plugindir] --socket [$socket] --port [$port] --version [$version] @@ -174,6 +179,7 @@ while test $# -gt 0; do --include) echo "$include" ;; --libs) echo "$libs" ;; --libs_r) echo "$libs_r" ;; + --plugindir) echo "$plugindir" ;; --socket) echo "$socket" ;; --port) echo "$port" ;; --version) echo "$version" ;; diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 8814e36b2fa..4819f512a65 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -733,7 +733,7 @@ sub record_log_pos { = @{$row_hash}{ qw / Master_Host Log_File Pos / }; } else { ($master_host, $log_file, $log_pos ) - = @{$row_hash}{ qw / Master_Host Master_Log_File Read_Master_Log_Pos / }; + = @{$row_hash}{ qw / Master_Host Relay_Master_Log_File Exec_Master_Log_Pos / }; } my $hostname = hostname(); @@ -836,9 +836,10 @@ log-pos-table from the values returned from "show master status" and log_file and log_pos columns, and establish the position in the binary logs that any slaves of this host should adopt if initialised from this dump. The slave status values are stored in master_host, -master_log_file, and master_log_pos, and these are useful if the host -performing the dump is a slave and other sibling slaves are to be -initialised from this dump. +master_log_file, and master_log_pos, corresponding to the coordinates +of the next to the last event the slave has executed. The slave or its +siblings can connect to the master next time and request replication +starting from the recorded values. The name of the log-pos table should be supplied in database.table format. A sample log-pos table definition: |