summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Include the "mysql-test/collections" directory when creating windows ZIP archiveKent Boortz2009-11-171-1/+1
|
* Add a few comments to clarify do_query() return values in ↵Timothy Smith2009-11-031-0/+4
| | | | mysql_secure_installation.pl
* Bug#48031: mysql_secure_installation -- bash bug regarding passwords withTimothy Smith2009-11-032-6/+48
| | | | | | | | | | | special chars This script failed when the user tried passwords with multiple spaces, \, # or ' characters. Now proper escaping and quoting is used in all contexts. This problem occurs in the Perl version of this script, too, so fix it in both places.
* Bug#48086: mysql_secure_installation does NOT work on SolarisTimothy Smith2009-11-031-3/+1
| | | | | Remove a bash-ism (if ! ...).
* Bug#35106: mysql_secure_installation fails on Windows, missing "useTimothy Smith2009-10-301-77/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | Term::ReadKey" Add the missing module import. Also, while here, fix a few glaring problems with the script, and ensure that it behaves properly. It seems this script may have never been working correctly (e.g., reading password didn't chomp() the result, so password was set with \n at the end; comparing the re-typed password to original was done with inverted test). Add END { cleanup(); } block to ensure the script removes temporary working files. Add SIG{INT} / SIG{QUIT} handler. Do a bit of reorganization to make the code easier to understand. Limit failed connection attempts to 3. Use ./bin/mysql if it exists, and then fall back on mysql in PATH (before it assumed 'mysql' in the path). Print a nicer error if 'mysql' can't be called. This has been tested on Windows (ActivePerl from cmd.exe, no cygwin needed) and Linux.
* Bug#41049 does syntax "grant" case insensitive?Sergey Glukhov2009-10-272-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem 1: column_priv_hash uses utf8_general_ci collation for the key comparison. The key consists of user name, db name and table name. Thus user with privileges on table t1 is able to perform the same operation on T1 (the similar situation with user name & db name, see acl_cache). So collation which is used for column_priv_hash and acl_cache should be case sensitive. The fix: replace system_charset_info with my_charset_utf8_bin for column_priv_hash and acl_cache Problem 2: The same situation with proc_priv_hash, func_priv_hash, the only difference is that Routine name is case insensitive. So the fix is to use my_charset_utf8_bin for proc_priv_hash & func_priv_hash and convert routine name into lower case before writing the element into the hash and before looking up the key. Additional fix: mysql.procs_priv Routine_name field collation is changed to utf8_general_ci. It's necessary for REVOKE command (to find a field by routine hash element values). Note: It's safe for lower-case-table-names mode too because db name & table name are converted into lower case (see GRANT_NAME::GRANT_NAME). mysql-test/include/have_case_insensitive_fs.inc: test case mysql-test/r/case_insensitive_fs.require: test case mysql-test/r/grant_lowercase_fs.result: test result mysql-test/r/lowercase_fs_off.result: test result mysql-test/r/ps_grant.result: test result mysql-test/r/system_mysql_db.result: changed Routine_name field collation to case insensitive mysql-test/t/grant_lowercase_fs.test: test case mysql-test/t/lowercase_fs_off.test: test case scripts/mysql_system_tables.sql: changed Routine_name field collation to case insensitive scripts/mysql_system_tables_fix.sql: changed Routine_name field collation to case insensitive sql/sql_acl.cc: Problem 1: column_priv_hash uses utf8_general_ci collation for the key comparison. The key consists of user name, db name and table name. Thus user with privileges on table t1 is able to perform the same operation on T1 (the similar situation with user name & db name, see acl_cache). So collation which is used for column_priv_hash and acl_cache should be case sensitive. The fix: replace system_charset_info with my_charset_utf8_bin for column_priv_hash and acl_cache Problem 2: The same situation with proc_priv_hash, func_priv_hash, the only difference is that Routine name is case insensitive. So the fix is to use my_charset_utf8_bin for proc_priv_hash & func_priv_hash and convert routine name into lower case before writing the element into the hash and before looking up the key. Additional fix: mysql.procs_priv Routine_name field collation is changed to utf8_general_ci. It's necessary for REVOKE command (to find a field by routine hash element values). Note: It's safe for lower-case-table-names mode too because db name & table name are converted into lower case (see GRANT_NAME::GRANT_NAME).
* backport of Chad's fix for bug #39326 to 5.0-bugteamGeorgi Kodinov2009-08-191-5/+19
|
* Merge the bug fix for 37808 ("make_binary_distribution.sh")Joerg Bruehe2009-07-211-5/+45
|\ | | | | | | | | into 5.0-build.
| * This is a fix for bug#37808Joerg Bruehe2009-06-261-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "make_binary_distribution" does not always generate correct names Originally, we solved deficiencies of the predefined "autoconf" macros (at least on OS X 10.5, they do not correctly differ between "x86" and "x86_64") by providing explicit "--platform" arguments. With this patch, "make_binary_distribution" evaluates CFLAGS, so it "just works" because CFLAGS contains information about the target CPU. This patch is accompanied by a change in our build tools that drops the setting of "--platform" arguments. scripts/make_binary_distribution.sh: This is a fix for bug#37808 "make_binary_distribution" does not always generate correct names Our platform names are the combination of operating system, architecture (CPU), and a possible suffix (typically "64bit", if a CPU is available in 32 bit too). We get these values from some predefined "autoconf" macros. However, these macros are not perfect, especially on OS X 10.5 they do not differ correctly between x86 (32 bit) and x86_64 (64 bit). Originally, we solved that by providing an explicit "--platform" argument, but it is better to get rid of that and ensure the script "just works". The best indication we have about the CPU is the "CFLAGS" value provided with "configure" and used in "make": It describes for which CPU the binaries are generated, not just which one was running the build. This approach should work even if we implement cross-compilation. So this patch evaluates CFLAGS and extracts its "-arch XYZ" part. When touching the file, I also replaced some tab characters by blanks.
* | Bug #36654: mysqld_multi cannot start instances with different versions Georgi Kodinov2009-06-191-1/+19
|/ | | | | | | | | | | | | | | | | | | occasionally. mysql_multi can call mysqld_safe. In doing this it's not changing the current working directory. This may cause confusion in the case where mysqld_multi is handling instances of servers of different versions and the current working directory is the installation directory of one of these servers. Fixed by enhancing the meaning of basedir in [mysqldN] sections of mysqld_multi. If specified, mysqld_multi will change the current working directory to the basedir directory before starting the server in mysqld_multi ... start ... and then change it back to what it was. scripts/mysqld_multi.sh: Bug #36654: optionally preserve, change and restore the cwd when starting server instances
* Use /usr/bin/perl as standard Perl install path (bug#44643)Kent Boortz2009-05-095-5/+5
|
* Merge main 5.0 into 5.0-buildJoerg Bruehe2009-05-082-35/+30
|\
| * Bug#35769 typo in mysqlhotcopy documentationStaale Smedseng2009-04-281-30/+30
| | | | | | | | | | | | Fixed a number of typos, and made punctuation and capitalization more consistent in documentation and help.
| * Bug#43876: mysqld_multi introduces --no-defaults which screws up my systemChad MILLER2009-04-021-5/+0
| | | | | | | | | | | | | | | | | | | | Bug#32136: mysqld_multi --defaults-file not respected while using \ --mysqld=mysqld_safe Revert change that adds "--no-defaults" to mysqld_multi. This closes Bug#43508 and re-opens Bug#32136.
* | Just fix a silly typo in an error message ...Joerg Bruehe2009-04-141-1/+1
|/ | | | | | scripts/make_win_bin_dist: Just fix a silly typo in an error message ... Change is so insignificant I even don't update the copyright year.
* Bug#42027: Incorrect parsing of debug and verbose options for mysqldumpslowTatiana A. Nurnberg2009-02-161-2/+2
| | | | | | | | | | | | | | | Options got normalised to long rather than short options since we gave primary name and alias in wrong order. Consequently querying for the option using the short options (the correct primary name) didn't work, rendering the options in question inaccessible. We restore the right order of the universe, or at least the alii for --debug and --verbose. scripts/mysqldumpslow.sh: Normalise --verbose/-v and --debug/-d to short options, not long options.
* Merge from bug tree.Chad MILLER2009-02-041-0/+5
|\
| * Bug#32136: mysqld_multi --defaults-file not respected while using \Chad MILLER2008-11-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --mysqld=mysqld_safe The server run didn't know the correct section to read in a configuration file, and would read from "[mysqld]" even though mysqld_multi had already read the defaults and made them into explicit parameters. Worse, the "defaults-file" parameter says that it means "Read only this configuration file, do not read the standard system-wide and user-specific files", which should apply not only to mysql-multi, but to the server also. So, now if "defaults-file" is given, put "no-defaults" before all the explicit parameters we read from the defaults-file and feed to the mysqld or mysqld_safe.
* | From 5.0.48 the NDB client libraries has been missing in the clusterKent Boortz2009-01-231-2/+2
|/ | | | | packages, this is now corrected (Bug#42278)
* Bug#35754: mysql_install_db does not work if no hostname is setChad MILLER2008-09-241-2/+2
| | | | | | | | | | Machines with hostname set to "localhost" cause uniqueness errors in the SQL bootstrap data. Now, insert zero lines for cases where the (lowercased) hostname is the same as an already-inserted 'localhost' name. Also, fix a few tests that expect certain local accounts to have a certain host name.
* Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM buildJoerg Bruehe2008-08-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly, this affected files (programs, scripts, and manual pages) which got built during a RPM build but were not listed in the appropriate "%files" section of the "spec" file. This is fixed now, they are added. To make this consistent, this patch also makes the build of "innochecksum" (and its inclusion in a tar.gz or other package) depend on whether InnoDB is configured in the build. Also, some tools to create Windows packages are irrelevant in any binary Unix package (not the sources !), and so they are deleted before packaging. configure.in: To prevent "innochecksum" from getting built even if InnoDB is not configured (and then being included in such packages), we need an "automake condition" that evaluates whether we have InnoDB. extra/Makefile.am: Evaluate the new automake condition about having InnoDB, and make the build of "innochecksum" depend on it. man/Makefile.am: Cleanup: There are manual files which we do not need, like those about tools for Windows builds / packaging (irrelevant in any Unix binary package) and about NDB tools which do not get built. scripts/make_binary_distribution.sh: In any Unix binary package, do not include tools for Windows builds (and their manual pages). This does not affect source packages, of course. support-files/mysql.spec.sh: There were several files (binaries, scripts, and manuals) which got built with a RPM but never packages, add them to the respective RPM.
* Bug#34159: mysql_install_db fails with sql_mode=TRADITIONALGeorgi Kodinov2008-07-311-0/+1
| | | | | | | | Reset session sql_mode before creating system tables as it is done in the mysql_fix_privilege_tables.sql script. scripts/mysql_system_tables.sql: reset sql mode
* OS X 10.5 is now a supported platform,Joerg Bruehe2008-06-271-0/+1
| | | | so Apple's internal name ("darwin9") must be translated to ours ("osx10.5").
* make_binary_distribution.sh:unknown2008-04-281-9/+3
| | | | | | | | Copy all of the "std_data" directory scripts/make_binary_distribution.sh: Copy all of the "std_data" directory
* Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50unknown2008-03-191-2/+2
|\ | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50
| * Bug #25486: mysqld_multi.server.sh missing from buildsunknown2008-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Make mysqld_multi.server executable, and allow it to be installed via chkconfig on LSB-compliant systems. scripts/make_binary_distribution.sh: Adjust permissions on some support-files/* scripts: make mysqld_multi.server executable, and mysql-VERSION.spec not executable. support-files/mysqld_multi.server.sh: Add LSB comments for chkconfig to simplify installation for sysadmins.
* | Merge trift2.:/MySQL/M50/clone-5.0unknown2008-03-142-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 scripts/make_win_bin_dist: Auto merged
| * | Include "mysql_upgrade_shell.pl" in a binary distribution on Windows.unknown2008-03-051-0/+1
| | |
| * | scripts/CMakeLists.txt : Treat "mysql_upgrade_shell" the same way as all ↵unknown2008-03-041-0/+3
| |/ | | | | | | | | | | | | the other scripts. scripts/CMakeLists.txt: Treat "mysql_upgrade_shell" the same way as all the other scripts.
* | Merge trift2.:/MySQL/M50/mysql-5.0unknown2008-03-141-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 client/mysqldump.c: Auto merged
| * \ Merge kaamos.(none):/data/src/mysql-5.0unknown2008-03-121-1/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kaamos.(none):/data/src/opt/mysql-5.0-opt client/mysql.cc: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/view.result: Manual merge. mysql-test/t/view.test: Manual merge. scripts/mysql_config.sh: Manual merge.
| | * Bug#29645: Link failure when using the embedded serverunknown2008-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_config --cflags gave a flag that forced the HP/UX C++ compiler into C-mode; as a result, C++ sources could not be compiled correctly. We now filter out the offending flag (like we do for Sun) so that --cflags will work for both C and C++. scripts/mysql_config.sh: Add -AC99 (for HP/UX) to the list of flags we need to remove from "mysql_config --cflags" so they work for C and C++ both.
* | | make_win_bin_dist:unknown2008-03-111-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | Include .pdb files for tools and libraries (bug#35104) scripts/make_win_bin_dist: Include .pdb files for tools and libraries (bug#35104)
* | | Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parametersunknown2008-03-071-4/+5
|/ / | | | | | | | | | | | | | | | | - Make sure mysqlhotcopy doesn't create unrestorable slaves. scripts/mysqlhotcopy.sh: Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters - Record what's been executed by the slave, not what's been delivered.
* | Merge ramayana.hindu.god:/home/tsmith/m/bk/b28460/50unknown2008-02-221-75/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50 scripts/mysqlhotcopy.sh: Auto merged
| * | Bug #28460 mysqlhotcopy silently skips a database with two alphanumerics nameunknown2008-02-181-75/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Remove code from mysqlhotcopy which deals with the so-called "RAID" feature of older MyISAM. scripts/mysqlhotcopy.sh: Remove code which tried to handle the so-called "RAID" files. The "RAID" feature has been dropped from MySQL builds, and this code caused mysqlhotcopy to skip (silently) over databases with two-character names (e.g., "ab").
* | Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50unknown2008-02-181-0/+11
|\ \ | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50
| * | Bug #21158 mysql_config doesn't include -lmygccunknown2008-02-141-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs. Required when linking against our static libs, if yassl is used, and gcc used to build library is significantly different from that which is using the library. scripts/mysql_config.sh: Add -lmygcc to --libs, --libs_r, and --embedded-libs output, if libmygcc.a is found in the pkglibdir. This works around a problem when linking against the static client libs which were built with a different GCC than the current compiler. In this case, without -lmygcc, several builtin functions (e.g., __pure_virtual, __builtin_delete) are left undefined. Currently it is yassl which pulls in these symbols. This isn't a problem when linking against shared libraries, or when using the same compiler version. Currently it shows up with libs built on build.mysql.com with gcc 2.95.3, when using them on more recent systems. Also strip the -mcpu, -mtune, and -march cflags. The calling package can determine what optimization parameters to choose.
* | Strip comments from queries before explaining them. Fixes BUG#34339unknown2008-02-061-3/+4
| |
* | Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:unknown2007-12-284-3/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Perl version of script "mysql_secure_installation" make_win_bin_dist: Corrected copy of SQL files to "share" directory scripts/mysql_secure_installation.pl.in: Added Perl version of script "mysql_secure_installation" scripts/CMakeLists.txt: Added Perl version of script "mysql_secure_installation" scripts/Makefile.am: Added Perl version of script "mysql_secure_installation" scripts/make_win_bin_dist: Corrected copy of SQL files to "share" directory
* | Merge trift2.:/MySQL/M50/bug33536-5.0unknown2007-12-281-4/+6
|\ \ | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| * \ Merge trift2.:/MySQL/M41/bug33536-4.1unknown2007-12-281-4/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/bug33536-5.0 scripts/make_binary_distribution.sh: Auto merged
| | * scripts/make_binary_distribution.sh:unknown2007-12-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the code to get the "libgcc" file name so that the failure of Intel's ICC to provide this information does not cause any problems. This fixes bug#33536 Option "--print-libgcc-file" does not work with ICC compiler scripts/make_binary_distribution.sh: The (old) code to get the "libgcc" file name does not really work when using Intel's ICC. ICC accepts the "--print-libgcc-file" option but ignores it, does not produce any output. However, ICC tricks automake into taking it for a GCC ("GXX" variable is set, see http://www.gnu.org/software/autoconf/manual/html_node/C_002b_002b-Compiler.html#C_002b_002b-Compiler and its discussion of the "AC_PROG_CXX" macro). There are two possible approaches: a) Check "$CC" or "$CXX" to tell ICC from GCC, and do not ask ICC for the "libgcc" file name. b) Just ask it, but protect that code so that its failure does not cause any damage. This patch takes the second route: 1) Put the call "@CC@ ... --print-libgcc-file" into a pipeline, followed by "|| true", so that (for the shell semantics) the command cannot fail. (ICC will exit non-zero because it is not given a source file.) 2) Explicitly redirect any error messages. 3) Do not use the compiler's return code but rather the (non)empty variable to check success. 4) Ensure that the contents really is a file before taking it as a file name. Item 1) is especially important when the tool gets a "set -e" (this happens in 5.1, currently) which would make the failing compiler call a fatal thing. This fixes bug#33536 Option "--print-libgcc-file" does not work with ICC compiler
* | | make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:unknown2007-12-2811-24/+963
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better Windows support in the scripts directory mysql_config.pl.in, mysql_install_db.pl.in: New Perl version of Unix shell script, mainly for Windows Many files in scripts directory: Use default Perl location "#!/usr/bin/perl" instead of the build host path extra/CMakeLists.txt: Added target for executable "resolveip" extra/resolveip.c: Exclude Unix specific headers when compiling on Windows scripts/CMakeLists.txt: On Windows, filter Perl scripts and change name from ".sh" to ".pl" mysql_convert_table_format.sh mysql_explain_log.sh mysql_secure_installation.sh mysql_tableinfo.sh mysqld_multi.sh mysqldumpslow.sh mysqlhotcopy.sh Do the same for the new Windows specific Perl versions of shell scripts mysql_config.pl.in mysql_install_db.pl.in In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on. scripts/Makefile.am: Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR scripts/make_win_bin_dist: Only include explicitly listed scripts from the "scripts" directory scripts/mysql_convert_table_format.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_explain_log.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_tableinfo.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqld_multi.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqldumpslow.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqlhotcopy.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_config.pl.in: New Perl version of Unix shell script, mainly for Windows scripts/mysql_install_db.pl.in: New Perl version of Unix shell script, mainly for Windows
* | Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-12-131-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.0-opt client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/mysql_com.h: Auto merged libmysql/CMakeLists.txt: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/delayed.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/merge.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/func_misc.result: manual merge mysql-test/r/innodb_mysql.result: manual merge mysql-test/t/func_misc.test: manual merge mysql-test/t/innodb_mysql.test: manual merge sql/sql_insert.cc: manual merge
| * \ Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445unknown2007-11-221-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
| | * | Fixed build failures on Windows introduced by the patch for bug #32221.unknown2007-11-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not have any executables in libmysql/release/ anymore.
* | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-releaseunknown2007-12-102-32/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged scripts/mysql_install_db.sh: Auto merged
| * | | | Bug #32219: too many hosts in default grant tables 6.0.3unknown2007-11-302-32/+45
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix is to remove any references to the current hostname when running mysql_install_db --cross-bootstrap. (The dist-hook make target makes this call, and the resulting data directory is included in the source distribution as win/data/*.) Also, a few other clean-ups to mysql_install_db while there. Makefile.am: Adapt to clean-up in mysql_install_db (--windows becomes --cross-bootstrap) scripts/mysql_install_db.sh: Filter out references to the current hostname when performing a cross-bootstrap installation by removing any lines which contain the string "@current_hostname". Deprecate the old --windows option; use --cross-bootstrap instead, since it more accurately reflects the purpose. Other clean-up: the wrong syntax was being used to test the exit status of mysqld --bootstrap. It mostly worked, as long as mysqld succeeded. However, it was not robust. scripts/mysql_system_tables_data.sql: Rename local @hostname variable to @current_hostname, which is a more unique label to search on. mysql_install_db now filters out all lines which include "@current_hostname" during a --cross-bootstrap installation.
* | | | Shell portability fix.unknown2007-11-291-3/+3
|/ / / | | | | | | | | | | | | | | | scripts/mysql_install_db.sh: Use "test !" instead of "! test", as the latter does not work on certain shells.
View Lorry Controller Status