diff options
Diffstat (limited to '0080_all_slot_script-5.1.15.patch')
| -rw-r--r-- | 0080_all_slot_script-5.1.15.patch | 540 |
1 files changed, 540 insertions, 0 deletions
diff --git a/0080_all_slot_script-5.1.15.patch b/0080_all_slot_script-5.1.15.patch new file mode 100644 index 0000000..40502d8 --- /dev/null +++ b/0080_all_slot_script-5.1.15.patch @@ -0,0 +1,540 @@ +diff -Naur -Naur mysqlold/scripts/Makefile.am mysql/scripts/Makefile.am +--- mysqlold/scripts/Makefile.am 2006-12-11 22:21:18.000000000 +0000 ++++ mysql/scripts/Makefile.am 2006-12-11 22:25:49.000000000 +0000 +@@ -61,6 +61,32 @@ + mysqlbug \ + make_win_bin_dist + ++sql_libexec_REPLACE = mysqld ++instance_manager_libexec_REPLACE= mysqlmanager ++client_bin_REPLACE = mysql mysqladmin mysqlcheck mysqlshow \ ++ mysqldump mysqlimport mysqltest mysqlbinlog \ ++ mysqltestmanagerc mysqltestmanager-pwgen ++extra_bin_REPLACE = replace comp_err perror resolveip my_print_defaults \ ++ resolve_stack_dump mysql_waitpid innochecksum ++myisam_bin_REPLACE = myisamchk myisamlog myisampack myisam_ftdump ++tools_bin_REPLACE = mysqltestmanager ++cw_cpcd_ndbbin_REPLACE = ndb_cpcd ++kernel_ndbbin_REPLACE = ndbd ++mgmsrv_ndbbin_REPLACE = ndb_mgmd ++sql_bin_REPLACE = mysql_tzinfo_to_sql ++tests_bin_REPLACE = mysql_client_test ++ndbtools_bin_REPLACE = ndb_test_platform ndb_waiter \ ++ ndb_drop_table ndb_delete_all \ ++ ndb_desc ndb_drop_index \ ++ ndb_show_tables ndb_select_all \ ++ ndb_select_count ndb_restore ndb_config ++EXTRA_REPLACE_BIN = safe_mysqld mysqlanalyze mysqloptimize mysqlrepair mysqld-max isamchk \ ++ $(sql_libexec_REPLACE) $(ndbtools_bin_REPLACE) \ ++ $(instance_manager_libexec_REPLACE) $(client_bin_REPLACE) \ ++ $(extra_bin_REPLACE) $(myisam_bin_REPLACE) $(tools_bin_REPLACE) \ ++ $(cw_cpcd_ndbbin_REPLACE) $(kernel_ndbbin_REPLACE) $(mgmsrv_ndbbin_REPLACE) \ ++ $(sql_bin_REPLACE) $(tests_bin_REPLACE) ++ + dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql + + # mysqlbug should be distributed built so that people can report build +@@ -93,8 +119,17 @@ + + .sh: + @RM@ -f $@ $@-t ++ bin_REPLACE='';\ ++ list='$(EXTRA_SCRIPTS) $(EXTRA_REPLACE_BIN)'; \ ++ for p in $${list}; do \ ++ f1=$${p/\.sh}; \ ++ f2=`echo "$${p}" | @SED@ -e 's|\.sh$$||' -e 's|^.*/||;$(transform)'`; \ ++ bin_REPLACE="$${bin_REPLACE}s!@mybin_$${f1}@!$${f2}!g;";\ ++ done; \ + @SED@ \ ++ -e "$${bin_REPLACE}" \ + -e 's!@''bindir''@!$(bindir)!g' \ ++ -e 's!@''sharedstatedir''@!$(sharedstatedir)!g' \ + -e 's!@''sbindir''@!$(sbindir)!g' \ + -e 's!@''scriptdir''@!$(bindir)!g' \ + -e 's!@''prefix''@!$(prefix)!g' \ +diff -Naur -Naur mysqlold/scripts/msql2mysql.sh mysql/scripts/msql2mysql.sh +--- mysqlold/scripts/msql2mysql.sh 2006-12-11 22:21:18.000000000 +0000 ++++ mysql/scripts/msql2mysql.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -13,4 +13,4 @@ + # described in the License. Among other things, the License requires that + # the copyright notice and this notice be preserved on all copies. + +-@bindir@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $* ++@bindir@/@mybin_replace@ msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $* +diff -Naur -Naur mysqlold/scripts/mysqlaccess.sh mysql/scripts/mysqlaccess.sh +--- mysqlold/scripts/mysqlaccess.sh 2006-12-11 22:21:19.000000000 +0000 ++++ mysql/scripts/mysqlaccess.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -17,7 +17,7 @@ + + # **************************** + # information on MySQL +- $MYSQL = '@bindir@/mysql'; # path to mysql executable ++ $MYSQL = '@bindir@/@mybin_mysql@'; # path to mysql executable + $SERVER = '3.21'; + $MYSQL_OPT = ' --batch --unbuffered'; + $ACCESS_DB = 'mysql'; # name of DB with grant-tables +@@ -32,7 +32,7 @@ + $ACCESS_U_BCK = 'user_backup'; + $ACCESS_D_BCK = 'db_backup'; + $DIFF = '/usr/bin/diff'; +- $MYSQLDUMP = '@bindir@/mysqldump'; ++ $MYSQLDUMP = '@bindir@/@mybin_mysqldump@'; + #path to mysqldump executable + + $MYSQLADMIN= 'http://foobar.com/MySQLadmin'; +diff -Naur -Naur mysqlold/scripts/mysql_config.sh mysql/scripts/mysql_config.sh +--- mysqlold/scripts/mysql_config.sh 2006-12-11 22:21:18.000000000 +0000 ++++ mysql/scripts/mysql_config.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -77,7 +77,7 @@ + + me=`get_full_path $0` + +-basedir=`echo $me | sed -e 's;/bin/mysql_config;;'` ++basedir=`echo $me | sed -e 's;/bin/@mybin_mysql_config@;;'` + + ldata='@localstatedir@' + execdir='@libexecdir@' +@@ -86,10 +86,10 @@ + # If installed, search for the compiled in directory first (might be "lib64") + pkglibdir='@pkglibdir@' + pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` +-fix_path pkglibdir $pkglibdir_rel lib/mysql lib ++fix_path pkglibdir $pkglibdir_rel "lib${pkglibdir##*lib}" lib/mysql lib + + pkgincludedir='@pkgincludedir@' +-fix_path pkgincludedir include/mysql include ++fix_path pkgincludedir "include${pkgincludedir##*include}" include/mysql include + + version='@VERSION@' + socket='@MYSQL_UNIX_ADDR@' +diff -Naur -Naur mysqlold/scripts/mysql_create_system_tables.sh mysql/scripts/mysql_create_system_tables.sh +--- mysqlold/scripts/mysql_create_system_tables.sh 2006-12-11 22:21:18.000000000 +0000 ++++ mysql/scripts/mysql_create_system_tables.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -19,7 +19,7 @@ + new context from the manual (from fill_help_tables.sql). + + Usage: +- mysql_create_system_tables [test|verbose|real] <path to mysql-database directory> <hostname> <windows option> ++ @mybin_mysql_create_system_tables@ [test|verbose|real] <path to mysql-database directory> <hostname> <windows option> + " + exit + fi +diff -Naur -Naur mysqlold/scripts/mysqld_multi.sh mysql/scripts/mysqld_multi.sh +--- mysqlold/scripts/mysqld_multi.sh 2006-12-11 22:21:19.000000000 +0000 ++++ mysql/scripts/mysqld_multi.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -10,8 +10,8 @@ + $opt_example = 0; + $opt_help = 0; + $opt_log = undef(); +-$opt_mysqladmin = "@bindir@/mysqladmin"; +-$opt_mysqld = "@libexecdir@/mysqld"; ++$opt_mysqladmin = "@bindir@/@mybin_mysqladmin@"; ++$opt_mysqld = "@libexecdir@/@mybin_mysqld@"; + $opt_no_log = 0; + $opt_password = undef(); + $opt_tcp_ip = 0; +@@ -39,11 +39,11 @@ + { + my $flag_exit= 0; + +- if (!defined(my_which(my_print_defaults))) ++ if (!defined(my_which(@mybin_my_print_defaults@))) + { + # We can't throw out yet, since --version, --help, or --example may + # have been given +- print "WARNING: my_print_defaults command not found.\n"; ++ print "WARNING: @mybin_my_print_defaults@ command not found.\n"; + print "Please make sure you have this command available and\n"; + print "in your path. The command is available from the latest\n"; + print "MySQL distribution.\n"; +@@ -74,9 +74,9 @@ + } + } + } +- my $com= "my_print_defaults "; ++ my $com= "@mybin_my_print_defaults@ "; + $com.= "--config-file=$opt_config_file " if (defined($opt_config_file)); +- $com.= "mysqld_multi"; ++ $com.= "@mybin_mysqld_multi@"; + my @defops = `$com`; + chop @defops; + splice @ARGV, 0, 0, @defops; +@@ -113,9 +113,9 @@ + print "Error with an option, see $my_progname --help for more info.\n"; + exit(1); + } +- if (!defined(my_which(my_print_defaults))) ++ if (!defined(my_which(@mybin_my_print_defaults@))) + { +- print "ABORT: Can't find command 'my_print_defaults'.\n"; ++ print "ABORT: Can't find command '@mybin_my_print_defaults@'.\n"; + print "This command is available from the latest MySQL\n"; + print "distribution. Please make sure you have the command\n"; + print "in your PATH.\n"; +@@ -202,7 +202,7 @@ + { + if ($my_print_defaults_exists) + { +- @mysqld_opts= `my_print_defaults mysqld`; ++ @mysqld_opts= `@mybin_my_print_defaults@ mysqld`; + chomp @mysqld_opts; + foreach my $opt (@mysqld_opts) + { +@@ -303,7 +303,7 @@ + @groups = &find_groups($groupids); + for ($i = 0; defined($groups[$i]); $i++) + { +- $com = "my_print_defaults"; ++ $com = "@mybin_my_print_defaults@"; + $com.= defined($opt_config_file) ? " --config-file=$opt_config_file" : ""; + $com.= " $groups[$i]"; + @options = `$com`; +@@ -330,7 +330,7 @@ + $tmp.= " $options[$j]"; + } + } +- if ($opt_verbose && $com =~ m/\/safe_mysqld$/ && !$info_sent) ++ if ($opt_verbose && $com =~ m/\/@mybin_safe_mysqld@$/ && !$info_sent) + { + print "WARNING: safe_mysqld is being used to start mysqld. In this case you "; + print "may need to pass\n\"ledir=...\" under groups [mysqldN] to "; +@@ -401,7 +401,7 @@ + my ($i, @groups)= @_; + my ($mysqladmin_found, $com, $tmp, $j); + +- $com = "my_print_defaults"; ++ $com = "@mybin_my_print_defaults@"; + $com.= defined($opt_config_file) ? " --config-file=$opt_config_file" : ""; + $com.= " $groups[$i]"; + @options = `$com`; +diff -Naur -Naur mysqlold/scripts/mysqld_safe.sh mysql/scripts/mysqld_safe.sh +--- mysqlold/scripts/mysqld_safe.sh 2006-12-11 22:21:19.000000000 +0000 ++++ mysql/scripts/mysqld_safe.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -91,7 +91,7 @@ + then + MYSQLD="mysqld-$tmp" + else +- MYSQLD="mysqld" ++ MYSQLD="@mybin_mysqld@" + fi + ;; + --nice=*) niceness=`echo "$arg" | sed -e "s;--nice=;;"` ;; +@@ -115,13 +115,13 @@ + + MY_PWD=`pwd` + # Check for the directories we would expect from a binary release install +-if test -f ./share/mysql/english/errmsg.sys -a -x ./bin/mysqld ++if test -f ./share/mysql/english/errmsg.sys -a -x ./bin/@mybin_mysqld@ + then + MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are + ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is + # Check for the directories we would expect from a source install + elif test -f ./share/mysql/english/errmsg.sys -a \ +- -x ./libexec/mysqld ++ -x ./libexec/@mybin_mysqld@ + then + MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are + ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is +@@ -183,17 +183,17 @@ + + # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe] + # and then merge with the command line arguments +-if test -x ./bin/my_print_defaults ++if test -x "./bin/@mybin_my_print_defaults@" + then +- print_defaults="./bin/my_print_defaults" +-elif test -x @bindir@/my_print_defaults ++ print_defaults="./bin/@mybin_my_print_defaults@" ++elif test -x "@bindir@/@mybin_my_print_defaults@" + then +- print_defaults="@bindir@/my_print_defaults" +-elif test -x @bindir@/mysql_print_defaults ++ print_defaults="@bindir@/@mybin_my_print_defaults@" ++elif test -x "@bindir@/@mybin_my_print_defaults@" + then +- print_defaults="@bindir@/mysql_print_defaults" ++ print_defaults="@bindir@/@mybin_my_print_defaults@" + else +- print_defaults="my_print_defaults" ++ print_defaults="@mybin_my_print_defaults@" + fi + + append_arg_to_args () { +@@ -222,7 +222,7 @@ + # If the user doesn't specify a binary, we assume name "mysqld" + if test -z "$MYSQLD" + then +- MYSQLD=mysqld ++ MYSQLD=@mybin_mysqld@ + fi + + if test ! -x $ledir/$MYSQLD +@@ -230,7 +230,7 @@ + echo "The file $ledir/$MYSQLD doesn't exist or is not executable" + echo "Please do a cd to the mysql installation directory and restart" + echo "this script from there as follows:" +- echo "./bin/mysqld_safe". ++ echo "./bin/@mybin_mysqld_safe@". + echo "See http://dev.mysql.com/doc/mysql/en/mysqld_safe.html for more" + echo "information" + exit 1 +@@ -390,8 +390,8 @@ + # the manual for details. + # + # echo "Checking tables in $DATADIR" +-# $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI +-# $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM ++# $MY_BASEDIR_VERSION/bin/@mybin_myisamchk@ --silent --force --fast --medium-check $DATADIR/*/*.MYI ++# $MY_BASEDIR_VERSION/bin/@mybin_isamchk@ --silent --force $DATADIR/*/*.ISM + + echo "Starting $MYSQLD daemon with databases from $DATADIR" + +diff -Naur -Naur mysqlold/scripts/mysqldumpslow.sh mysql/scripts/mysqldumpslow.sh +--- mysqlold/scripts/mysqldumpslow.sh 2006-12-11 22:21:19.000000000 +0000 ++++ mysql/scripts/mysqldumpslow.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -34,16 +34,16 @@ + $opt{'help'} and usage(); + + unless (@ARGV) { +- my $defaults = `my_print_defaults mysqld`; ++ my $defaults = `@mybin_my_print_defaults@ mysqld`; + my $basedir = ($defaults =~ m/--basedir=(.*)/)[0] +- or die "Can't determine basedir from 'my_print_defaults mysqld' output: $defaults"; ++ or die "Can't determine basedir from '@mybin_my_print_defaults@ mysqld' output: $defaults"; + warn "basedir=$basedir\n" if $opt{v}; + + my $datadir = ($defaults =~ m/--datadir=(.*)/)[0]; + if (!$datadir or $opt{i}) { + # determine the datadir from the instances section of /etc/my.cnf, if any +- my $instances = `my_print_defaults instances`; +- die "Can't determine datadir from 'my_print_defaults mysqld' output: $defaults" ++ my $instances = `@mybin_my_print_defaults@ instances`; ++ die "Can't determine datadir from '@mybin_my_print_defaults@ mysqld' output: $defaults" + unless $instances; + my @instances = ($instances =~ m/^--(\w+)-/mg); + die "No -i 'instance_name' specified to select among known instances: @instances.\n" +@@ -51,7 +51,7 @@ + die "Instance '$opt{i}' is unknown (known instances: @instances)\n" + unless grep { $_ eq $opt{i} } @instances; + $datadir = ($instances =~ m/--$opt{i}-datadir=(.*)/)[0] +- or die "Can't determine --$opt{i}-datadir from 'my_print_defaults instances' output: $instances"; ++ or die "Can't determine --$opt{i}-datadir from '@mybin_my_print_defaults@ instances' output: $instances"; + warn "datadir=$datadir\n" if $opt{v}; + } + +diff -Naur -Naur mysqlold/scripts/mysql_fix_privilege_tables.sh mysql/scripts/mysql_fix_privilege_tables.sh +--- mysqlold/scripts/mysql_fix_privilege_tables.sh 2006-12-11 22:21:18.000000000 +0000 ++++ mysql/scripts/mysql_fix_privilege_tables.sh 2006-12-11 22:27:58.000000000 +0000 +@@ -77,17 +77,17 @@ + # Get first arguments from the my.cfg file, groups [mysqld] and + # [mysql_install_db], and then merge with the command line arguments + +-print_defaults=my_print_defaults ++print_defaults=@mybin_my_print_defaults@ + for dir in ./bin @bindir@ @bindir@ extra $print_defaults_bindir/../bin $print_defaults_bindir/../extra + do +- if test -x $dir/my_print_defaults ++ if test -x $dir/@mybin_my_print_defaults@ + then +- print_defaults="$dir/my_print_defaults" ++ print_defaults="$dir/@mybin_my_print_defaults@" + break + fi + done + +-parse_arguments `$print_defaults $defaults mysql_install_db mysql_fix_privilege_tables` ++parse_arguments `$print_defaults $defaults @mybin_mysql_install_db@ @mybin_mysql_fix_privilege_tables@` + parse_arguments PICK-ARGS-FROM-ARGV "$@" + + if test -z "$password" +@@ -118,7 +118,7 @@ + exit 1 + fi + +-cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host" ++cmd="$bindir/@mybin_mysql@ --no-defaults --force --user=$user --host=$host" + if test ! -z "$port"; then + cmd="$cmd --port=$port" + fi +@@ -133,7 +133,7 @@ + fi + + # Find where first mysql_fix_privilege_tables.sql is located +-for i in $basedir/support-files $basedir/share $basedir/share/mysql \ ++for i in @sharedstatedir@ $basedir/support-files $basedir/share $basedir/share/mysql \ + $basedir/scripts $pkgdatadir . "$dirname" + do + if test -f $i/$file +diff -Naur -Naur mysqlold/scripts/mysql_install_db.sh mysql/scripts/mysql_install_db.sh +--- mysqlold/scripts/mysql_install_db.sh 2006-12-11 22:21:18.000000000 +0000 ++++ mysql/scripts/mysql_install_db.sh 2006-12-11 22:30:43.000000000 +0000 +@@ -58,20 +58,20 @@ + + # Get first arguments from the my.cfg file, groups [mysqld] and + # [mysql_install_db], and then merge with the command line arguments +-if test -x ./bin/my_print_defaults ++if test -x "./bin/@mybin_my_print_defaults@" + then +- print_defaults="./bin/my_print_defaults" +-elif test -x ./extra/my_print_defaults ++ print_defaults="./bin/@mybin_my_print_defaults@" ++elif test -x "./extra/@mybin_my_print_defaults@" + then +- print_defaults="./extra/my_print_defaults" +-elif test -x @bindir@/my_print_defaults ++ print_defaults="./extra/@mybin_my_print_defaults@" ++elif test -x "@bindir@/@mybin_my_print_defaults@" + then +- print_defaults="@bindir@/my_print_defaults" +-elif test -x @bindir@/mysql_print_defaults ++ print_defaults="@bindir@/@mybin_my_print_defaults@" ++elif test -x "@bindir@/@mybin_my_print_defaults@" + then +- print_defaults="@bindir@/mysql_print_defaults" ++ print_defaults="@bindir@/@mybin_my_print_defaults@" + else +- print_defaults="my_print_defaults" ++ print_defaults="@mybin_my_print_defaults@" + fi + + args= +@@ -96,10 +96,10 @@ + pkgdatadir=@pkgdatadir@ + else + bindir="$basedir/bin" +- if test -x "$basedir/libexec/mysqld" ++ if test -x "$basedir/libexec/@mybin_mysqld@" + then + execdir="$basedir/libexec" +- elif test -x "$basedir/sbin/mysqld" ++ elif test -x "$basedir/sbin/@mybin_mysqld@" + then + execdir="$basedir/sbin" + else +@@ -112,7 +112,8 @@ + then + fill_help_tables=$srcdir/scripts/fill_help_tables.sql + else +- for i in $basedir/support-files $basedir/share $basedir/share/mysql \ ++ for i in @sharedstatedir@ \ ++ $basedir/support-files $basedir/share $basedir/share/mysql \ + $basedir/scripts `pwd` `pwd`/scripts @pkgdatadir@ + do + if test -f $i/fill_help_tables.sql +@@ -131,13 +132,13 @@ + fi + + mdata=$ldata/mysql +-mysqld=$execdir/mysqld ++mysqld=$execdir/@mybin_mysqld@ + mysqld_opt="" + scriptdir=$bindir + + if test "$windows" = 1 + then +- mysqld="./sql/mysqld" ++ mysqld="./sql/@mybin_mysqld@" + if test -n "$srcdir" -a -f $srcdir/sql/share/english/errmsg.sys + then + langdir=$srcdir/sql/share/english +@@ -167,14 +168,14 @@ + # Check if hostname is valid + if test "$windows" = 0 -a "$in_rpm" = 0 -a $force = 0 + then +- resolved=`$bindir/resolveip $hostname 2>&1` ++ resolved=`$bindir/@mybin_resolveip@ $hostname 2>&1` + if [ $? -ne 0 ] + then +- resolved=`$bindir/resolveip localhost 2>&1` ++ resolved=`$bindir/@mybin_resolveip@ localhost 2>&1` + if [ $? -ne 0 ] + then + echo "Neither host '$hostname' nor 'localhost' could be looked up with" +- echo "$bindir/resolveip" ++ echo "$bindir/@mybin_resolveip@" + echo "Please configure the 'hostname' command to return a correct hostname." + echo "If you want to solve this at a later stage, restart this script with" + echo "the --force option" +@@ -182,7 +183,7 @@ + fi + echo "WARNING: The host '$hostname' could not be looked up with resolveip." + echo "This probably means that your libc libraries are not 100 % compatible" +- echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" ++ echo "with this binary MySQL version. The MySQL daemon, @mybin_mysqld@, should work" + echo "normally with the exception that host name resolving will not work." + echo "This means that you should use IP addresses instead of hostnames" + echo "when specifying MySQL privileges !" +@@ -227,7 +228,7 @@ + mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \ + --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \ + --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K" +-if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \ ++if $scriptdir/@mybin_mysql_create_system_tables@ $create_option $mdata $hostname $windows \ + | eval "$mysqld_install_cmd_line" + then + if test -n "$fill_help_tables" +@@ -257,8 +258,8 @@ + then + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "To do so, start the server, then issue the following commands:" +- echo "$bindir/mysqladmin -u root password 'new-password'" +- echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'" ++ echo "$bindir/@mybin_mysqladmin@ -u root password 'new-password'" ++ echo "$bindir/@mybin_mysqladmin@ -u root -h $hostname password 'new-password'" + echo "See the manual for more instructions." + # + # Print message about upgrading unless we have created a new db table. +@@ -266,14 +267,14 @@ + then + echo + echo "NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run" +- echo "the $bindir/mysql_fix_privilege_tables. Otherwise you will not be" ++ echo "the $bindir/@mybin_mysql_fix_privilege_tables@. Otherwise you will not be" + echo "able to use the new GRANT command!" + fi + echo + if test "$in_rpm" = "0" + then + echo "You can start the MySQL daemon with:" +- echo "cd @prefix@ ; $bindir/mysqld_safe &" ++ echo "cd @prefix@ ; $bindir/@mybin_mysqld_safe@ &" + echo + fi + echo "Please report any problems with the @scriptdir@/mysqlbug script!" +@@ -290,13 +291,13 @@ + echo "You can also try to start the mysqld daemon with:" + echo "$mysqld --skip-grant &" + echo "You can use the command line tool" +- echo "$bindir/mysql to connect to the mysql" ++ echo "$bindir/@mybin_mysql@ to connect to the mysql" + echo "database and look at the grant tables:" + echo +- echo "shell> $bindir/mysql -u root mysql" ++ echo "shell> $bindir/@mybin_mysql@ -u root mysql" + echo "mysql> show tables" + echo +- echo "Try 'mysqld --help' if you have problems with paths. Using --log" ++ echo "Try '@mybin_mysqld@ --help' if you have problems with paths. Using --log" + echo "gives you a log in $ldata that may be helpful." + echo + echo "The latest information about MySQL is available on the web at" +@@ -305,6 +306,6 @@ + echo "and the manual section that describes problems on your OS." + echo "Another information source is the MySQL email archive." + echo "Please check all of the above before mailing us!" +- echo "And if you do mail us, you MUST use the @scriptdir@/mysqlbug script!" ++ echo "And if you do mail us, you MUST use the @scriptdir@/@mybin_mysqlbug@ script!" + exit 1 + fi +diff -Naur -Naur mysqlold/scripts/mysql_secure_installation.sh mysql/scripts/mysql_secure_installation.sh +--- mysqlold/scripts/mysql_secure_installation.sh 2006-12-11 22:21:18.000000000 +0000 ++++ mysql/scripts/mysql_secure_installation.sh 2006-12-11 22:25:49.000000000 +0000 +@@ -30,7 +30,7 @@ + + do_query() { + echo $1 >$command +- mysql --defaults-file=$config <$command ++ @mybin_mysql@ --defaults-file=$config <$command + return $? + } + |