summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M50/bug31644-5.0unknown2007-10-192-6/+14
|\ | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged scripts/Makefile.am: Auto merged
| * Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the ↵unknown2007-10-182-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original and the modified values of the compile-related variables used in "configure". Make the necessary adjustments in "configure.in" and "scripts/Makefile.am". This fixes bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug configure.in: Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS. This is necessary so that the "mysqlbug" script can output the variables affecting compilation with both their original (on call) and final (modified) values. This work is related to fixing bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug scripts/Makefile.am: Clearly differ between the original and the modified values of the compile-related variables used in "configure". This is to fix bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug scripts/mysqlbug.sh: Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO" which contain the original (call parameters, environment) and the modified values of the "configure" variables controlling the compile process. This fixes bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug
* | Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-10-102-0/+11
|\ \ | |/ | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/mysql-test-run.pl: Auto merged scripts/mysql_system_tables_data.sql: Auto merged
| * Restore creation of test databases and the anonymous user whichunknown2007-10-042-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | were accidentally removed during a previous rototill of this code. Fixes bug#27692. While it can be argued we should strive to provide a 'secure by default' installation, this happens to be the setup currently documented in the manual as the default, so defer changes that improve security out of the box to a co-ordinated effort later on. For now, make a note about the test databases and anonymous user in mysql_install_db and recommend that mysql_secure_installation be ran for users wishing to remove these defaults. [..re-commit of previously lost change..] scripts/mysql_system_tables_data.sql: Add anonymous accounts. scripts/mysql_install_db.sh: Point users at the mysql_secure_installation script. mysql-test/mysql-test-run.pl: Add a comment where removing anonymous users.
* | Change URLs.unknown2007-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our web server has been restructured several times, and references to it in our source code has stayed the same. This patch from Paul DuBois updates all URLs to modern semantics. debian/po/ca.po: Change URLs. debian/po/cs.po: Change URLs. debian/po/da.po: Change URLs. debian/po/gl.po: Change URLs. debian/po/ja.po: Change URLs. debian/po/pt_BR.po: Change URLs. debian/po/sv.po: Change URLs. debian/po/tr.po: Change URLs. mysql-test/lib/mtr_report.pl: Change URLs. mysql-test/mysql-test-run-shell.sh: Change URLs. ndb/include/ndbapi/Ndb.hpp: Change URLs. netware/mysql_test_run.c: Change URLs. scripts/mysqld_safe.sh: Change URLs. sql/mysqld.cc: Change URLs.
* | Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167unknown2007-10-034-3/+10
|\ \ | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
| * \ Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-09-281-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged scripts/mysql_config.sh: Auto merged libmysql/libmysql.c: Manual merge
| | * Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-09-041-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| | | * Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildunknown2007-08-291-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build scripts/mysql_config.sh: Auto merged
| | | | * mysql_config.sh:unknown2007-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flag changed name in icc 10 scripts/mysql_config.sh: Flag changed name in icc 10
| * | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-09-154-2/+9
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/tnurnberg/15327/50-15327 client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged libmysql/libmysql.c: Auto merged mysql-test/Makefile.am: Auto merged scripts/Makefile.am: Auto merged sql/mysqld.cc: Auto merged tests/mysql_client_test.c: Auto merged
| | * | | Bug #15327: configure: --with-tcp-port option being partially ignoredunknown2007-09-134-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure that if builder configured with a non-standard (!= 3306) default TCP port that value actually gets used throughout. if they didn't configure a value, assume "use a sensible default", which will be read from /etc/services or, failing that, from the factory default. That makes the order of preference - command-line option - my.cnf, where applicable - $MYSQL_TCP_PORT environment variable - /etc/services (unless configured --with-tcp-port) - default port (--with-tcp-port=... or factory default) client/mysql.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysql_upgrade.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqladmin.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlbinlog.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlcheck.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqldump.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlimport.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlmanagerc.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear configure.in: Bug #15327: configure: --with-tcp-port option being partially ignored If MYSQL_TCP_PORT defaulted in configure (factory default 3306 at the time of this writing), set MYSQL_TCP_PORT to factory default, then clear factory default after. That way, we lose no information, and we can distinguish between "defaulted" and the pathological case "builder specifically configured a port that coincides with factory default." This can in theory happen if builder configures and builds several servers from a script (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326). Not all that probable, but much preferable to having more "magic" happen in the server when we can solve this without any guesswork. client/mysqlshow.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqltest.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear include/mysql_version.h.in: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) libmysql/libmysql.c: Bug #15327: configure: --with-tcp-port option being partially ignored initialize default tcp port for client, like so: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) - environment variable MYSQL_TCP_PORT overrides this default - command-line option overrides all of the above mysql-test/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) mysql-test/mysql-test-run-shell.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) netware/mysql_test_run.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time netware/mysqld_safe.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time scripts/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) scripts/mysql_config.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) scripts/mysql_fix_privilege_tables.sh: Bug #15327: configure: --with-tcp-port option being partially ignored clarifying notice only scripts/mysqld_safe-watch.sh: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time server-tools/instance-manager/priv.h: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time sql/mysqld.cc: Bug #15327: configure: --with-tcp-port option being partially ignored if builder specifically requested a default port, use that (even if it coincides with our factory default). only if they didn't do we check /etc/services (and, failing on that, fall back to the factory default of 3306). either default can be overridden by the environment variable MYSQL_TCP_PORT, which in turn can be overridden with command line options. tests/mysql_client_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear tests/ssl_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time tests/thread_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear
* | | | | Bug#31167 Introduction of @@hostname breaks replication in a ringunknown2007-09-261-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use a local uservariable to avoid @@hostname in binlog scripts/mysql_system_tables_data.sql: Load @@hostname into a local user variable to avoid writing @@hostname to the binary log that potentially would be replicated to a slave server that not yet was upgraded to have @@hostname.
* | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50unknown2007-08-281-24/+8
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
| * | | Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003unknown2007-08-201-24/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in the get_list_of_tables() routine. The symptom is that, when used with recent versions of DBD::mysql, mysqlhotcopy uses a double-qualified table name, for example: Invalid db.table name 'test.test`.`x' at /usr/bin/mysqlhotcopy line 855. This is caused by a change in DBD::mysql. See this diff: http://svn.perl.org/viewcvs/modules/DBD-mysql/trunk/lib/DBD/mysql.pm?r1=9183&r2=9188 Basically, older DBD::mysql implemented a limited ->table_info method; now the full method is implemented, and as a result DBI's ->tables() method has access to the schema value, so it uses it. scripts/mysqlhotcopy.sh: Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in get_list_of_tables(). DBI's ->tables() method calls "SHOW TABLES" under the hood, and then quotes the names and (depending on DBD::mysql version) adds the schema name, too. mysqlhotcopy doesn't want the schema name or the quotes, so it's all around better to just call "SHOW TABLES" itself.
* | | | make_win_src_distribution_old.sh:unknown2007-08-142-3/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh Makefile.am, make_win_src_distribution_old.sh: Rename and put in note not to be used scripts/make_win_src_distribution_old.sh: Rename and put in note not to be used scripts/Makefile.am: Rename and put in note not to be used
* | | make_win_bin_dist:unknown2007-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Corrected install path scripts/make_win_bin_dist: Corrected install path
* | | make_win_bin_dist:unknown2007-08-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Copy embedded .pdb and static debug lib scripts/make_win_bin_dist: Copy embedded .pdb and static debug lib
* | | CMakeLists.txt, README, configure.jsunknown2007-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several adjustments to make client libraries pass the link test on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118) win/README: - Removed references to PARTITION engine, 5.1 only win/configure.js: - Removed references to PARTITION engine, 5.1 only extra/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". myisam/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". scripts/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". server-tools/instance-manager/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". sql/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". mysys/CMakeLists.txt: Restored include path to "mysys" itself dbug/CMakeLists.txt: Changed to optionally be included to give a file list only extra/yassl/CMakeLists.txt: Changed to optionally be included to give a file list only extra/yassl/taocrypt/CMakeLists.txt: Changed to optionally be included to give a file list only zlib/CMakeLists.txt: Changed to optionally be included to give a file list only libmysql/CMakeLists.txt: For compatibility with Visual Studio 2005, list all files that are to be part of the library build, i.e. libraries can't be built from other libraries. Set SOURCE_SUBLIBS and include the file listings from "zlib", "dbug", "taocrypt" and "yassl"
* | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-021-55/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 sql/CMakeLists.txt: Auto merged
| * | | make_win_bin_dist:unknown2007-08-021-53/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified copying of 'mysql-test' directory scripts/make_win_bin_dist: Simplified copying of 'mysql-test' directory
| * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-021-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
| | * | | CMakeLists.txt (several), make_win_bin_dist:unknown2007-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligned client library build and use with the Unix version when it comes to what source to include directly in the builds, and what libraries to link with (bug#30118). Also reviewed, corrected and made more clear when static or dynamic Thread Local Storage is to be used. Some code duplication was removed, and some redundant library usage were removed, reducing the risk of incorrect TLS usage. client/CMakeLists.txt: - Removed code duplication by moving build of "mysqlclient" to the "libmysql" directory - Link clients with the new "mysqlclient_notls", to protect for the case the clients use more than the client API, and access thread data directly. - Synced explicit target addition of sources with Unix. dbug/CMakeLists.txt: No need to set CXX flags, no C++ code libmysql/CMakeLists.txt: - Aligned more with Unix version when it comes to included source files - Build both DLL and static library in this directory - Produce separe static TLS version of the static client library, for use when building clients in this build that might access TLS storage directly. mysys/CMakeLists.txt: We only have to build the static TLS version, as no clients are linking directly with the "mysys" library. scripts/make_win_bin_dist: Ajusted paths to new "mysqlclient.lib" location in source tree sql/CMakeLists.txt: Removed duplicate "ha_blackhole.cc" in file listing Removed explicit link to "dbug.lib" not needed Link with the static TLS "mysqlclient_notls" tests/CMakeLists.txt: Removed explicit link to "dbug", "mysys", "yassl", "taocrypt" and "zlib" not needed. Added explicit source addition "../mysys/my_memmem.c". No need for setting CXX flags, no C++ code. Use the static TLS "mysqlclient_notls" for linkage. zlib/CMakeLists.txt: No need for a dynamic TLS version of this library, no access to thread storage is done from it. Also no need to define MYSQL_CLIENT, not used, or __WIN32__ that is handled by the library header without this define.
* | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-011-14/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 configure.in: Auto merged
| * | | | Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-08-011-14/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
| | * \ \ \ Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maintunknown2007-08-011-14/+8
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | | | | | | | | | | into production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
| | | * | Option 6 tries to grant global privileges at the database levelunknown2007-08-011-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which does not work. Removing these attempted privileges makes this identical to option 5 so remove it completely. The spirit of the program appears to be aimed at database privileges, so do not add another option for granting global privileges as it may be unexpected. Fixes bug#14618 (same as previous patch, this time applied to -maint tree). scripts/mysql_setpermission.sh: Option 6 tries to apply global privileges at the database level which does not work - remove it.
* | | | | Generate "config.h" directly into the "include" directory, later copiedunknown2007-07-301-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to "my_config.h". Not to pollute the top directory, and to get more control over what is included. Made the include path for "libedit" pick up its own "config.h" first. config/ac-macros/misc.m4: aclocal in automake 1.8 can't handle AC_REQUIRE on a user macro defined in the same included file. cmd-line-utils/libedit/Makefile.am: Changed include path so that current directory is taken first, as there is a "config.h" there with the same name as the one in top "include". configure.in: Generate "config.h" directly into "include", don't pollute top directory include/Makefile.am: Copy "config.h" from current directory to "my_config.h", added note in the make file why there are two identical files with different name. scripts/make_binary_distribution.sh: Removed copy of "config.h" from top directory, it is in "include" in a source tree.
* | | | More fixes and cleanups for bug#28585:unknown2007-07-271-29/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make the 'dist-hook' from top-level Makefile work again. - we can find my_print_defaults from --basedir by parsing command line arguments prior to running my_print_defaults. - take advantage of additional command line parsing and allow the --no-defaults etc arguments to work anywhere rather than having to be the first argument. - find SQL files either from binary archive or source install. - consolidate and tidy code and error messages. scripts/mysql_install_db.sh: Consolidate error messages.
* | | | mysql_install_db.sh:unknown2007-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error in previous change, correct --language argument. scripts/mysql_install_db.sh: Fix error in previous change, correct --language argument.
* | | | Apply a few more cleanups to improve the robustness of mysql_install_dbunknown2007-07-261-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | scripts/mysql_install_db.sh: Put back variable initialisation for those which could be passed in via the environment and confuse the script.
* | | | Clean up the mysql_install_db script to ensure that a sane environment isunknown2007-07-262-140/+136
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available and reduce the chance of failure. This should fix bug#28585 which is caused by the script being quite random in how it finds files it requires and not giving very good feedback to the user about what went wrong. Also update make_binary_distribution so that it provides the correct path to the required SQL scripts when generating mysql_install_db. The script only previously worked because of the permissive behaviour which looked around the current working directory before the "correct" location. This could lead to severe problems if the user happened to run the script from a location which contained older or even broken copies of the SQL scripts. We now require either a complete binary release (and the mysql_install_db script ran from inside the extracted archive), or an installed compiled tree, as this is the only way we can be sure everything that we need is available and ready to run. While working on this fix, also clean up the mysql_install_db script a lot to make it simpler, easier to read, and hopefully less prone to bugs in the future. scripts/make_binary_distribution.sh: SQL files live in ./share not ./support-files in binary distribution. scripts/mysql_install_db.sh: Use a consistent shell indentation style.
* | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46unknown2007-07-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged libmysql/libmysql.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged
| * | | make_binary_distribution.sh:unknown2007-07-171-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | BUG#29382 scripts/make_binary_distribution.sh: BUG#29382
* | | Ensure "mysql-stress-test.pl" is included in both "tar.gz" and RPM packages.unknown2007-07-171-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug#21023: "mysql-stress-test.pl" missing in builds mysql-test/Makefile.am: Ensure "mysql-stress-test.pl" is handled by "make install" in the "mysql-test" directory. This should get the script into the result tree of a RPM build. Fixing bug#21023. scripts/make_binary_distribution.sh: Copy "mysql-test/mysql-stress-test.pl" into a binary distribution ("tar.gz" and derived formats). Fixing bug#21023.
* | fix make_win_bin_dist typounknown2007-06-131-1/+1
| | | | | | | | | | scripts/make_win_bin_dist: add missing backslash
* | make_win_bin_dist:unknown2007-06-121-12/+32
| | | | | | | | | | | | | | | | Aligned headers to include with Unix 'make install' scripts/make_win_bin_dist: Aligned headers to include with Unix 'make install'
* | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0unknown2007-05-241-32/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged include/my_global.h: Auto merged sql/item_func.cc: Auto merged strings/strtod.c: Auto merged
| * \ Merge trift2.:/MySQL/M50/bug26609-5.0unknown2007-05-221-32/+40
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| | * | scripts/make_binary_distribution.sh :unknown2007-05-221-32/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include all the additional test suites in the binary packages ("tar.gz"). This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done. scripts/make_binary_distribution.sh: Include all the additional test suites (for now: "funcs_1", "funcs_2", "row_lock") in the binary packages ("tar.gz"). Take them "as is", without any file filtering (except for the BK subdirectories "SCCS"). This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done. Use this opportunity to correct the language in some comments.
* | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50unknown2007-05-211-17/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 configure.in: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged
| * | | Fix bug#27833 "Bourne shell string comparison issue in ↵unknown2007-05-151-17/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/make_win_bin_dist": Several string comparisons could never yield true because they had an 'x' guard added to the variable but not to the constant value. Fix that by guarding both sides. scripts/make_win_bin_dist: Fix bug#27833 "Bourne shell string comparison issue in scripts/make_win_bin_dist": Several string comparisons could never yield true because they had an 'x' guard added to the variable but not to the constant value. Fix that by guarding both sides. Use this occasion to apply some corrections to the comments and the usage text. Also, ensure the ".pdb" file is always optional.
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401unknown2007-05-191-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and ↵unknown2007-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NO_ZERO_DATE - The SQL commands used by mysql_upgrade are written to be run with sql_mode set to '' - thus the scripts should change sql_mode for the session to make sure the SQL is legal. mysql-test/r/mysql_upgrade.result: Update test result mysql-test/t/mysql_upgrade.test: The SQL commands used by mysql_upgrade are written to be run with sql_mode set to '' - thus the scripts should change sql_mode for the session to make sure the SQL is legal. scripts/mysql_system_tables_fix.sql: Set sql_mode to '' before running the SQL commands to fix system tables - backport from 5.1
* | | | Merge siva.hindu.god:/home/tsmith/m/bk/50unknown2007-05-171-7/+9
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/r/type_datetime.result: Auto merged mysql-test/t/outfile.test: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/field.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/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged
| * | Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some ↵unknown2007-05-031-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generated files (here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds. scripts/Makefile.am: Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive a "make clean", this is essential for cross-builds. So move them from "CLEANFILES" to "DISTCLEANFILES".
| * | Resolve a possible timing issue with ↵unknown2007-05-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "scripts/mysql_fix_privilege_tables_sql.c" in the source tarball, this is essential for cross builds, like for NetWare. scripts/Makefile.am: On a fast build machine, both the source (mysql_fix_privilege_tables.sql) and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps (granularity is one second only, may be too coarse). If that happens, the Makefile rule will fire, and "comp_sql" will be built and called - which fails in a cross build, like for NetWare. Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.
| * | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-05-021-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 scripts/Makefile.am: Auto merged
| | * | Necessary change for cross-builds: Include ↵unknown2007-04-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "mysql_fix_privilege_tables_sql.c" in the source tarball. scripts/Makefile.am: Necessary change for cross-builds (like we do for NetWare): Generate "mysql_fix_privilege_tables_sql.c" during Bootstrap and include it in the source tarball which is created via "make dist".
| * | | Format corrections for various "Makefile.am": Leading tab, no trailing blank.unknown2007-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. libmysqld/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. netware/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. scripts/Makefile.am: "Makefile" command lines must start with a tab, not with blanks. win/Makefile.am: After a backslash (to mark a continuation line) there must not be a trailing blank.
View Lorry Controller Status