summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Install mysqld.libJonathan Perkin2009-09-041-0/+1
|
* Only install the innodb plugin if the plugin directory exists.Jonathan Perkin2009-09-011-8/+14
|
* Install innodb_plugin on Windows.Jonathan Perkin2009-08-181-0/+11
|
* Merge the fix for bug#37808 into 5.1-build.Joerg Bruehe2009-07-211-5/+54
|\
| * Upmerge a bug fix from 5.0 to 5.1:Joerg Bruehe2009-07-211-5/+54
| |\ | | | | | | | | | | | | | | | | | | bug#37808 "make_binary_distribution" does not always generate correct names Successfully tested on 5.1 sources.
| | * 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.
* | | automergeGeorgi Kodinov2009-06-191-1/+19
|\ \ \ | |/ / |/| |
| * | 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
* | Merge up 5.0-build into 5.1-build:Joerg Bruehe2009-05-295-5/+5
|\ \ | |/ | | | | | | | | mostly just the merge changesets, but also a change of Perl scripts to use "/usr/bin/perl" fixed.
| * 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 #44736 mysqld_safe's my_which() is broken and Staale Smedseng2009-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't find 'logger' Due to a variable quoting mistake, the $PATH environment variable isn't parsed correctly when searching for the existence of the desired executable(s) (logger in this case). This patch removes the quotes.
* | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-05-152-3/+8
|\ \ \
| * \ \ Merge main 5.1 into 5.1-buildJoerg Bruehe2009-05-082-35/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 165 changesets with 23 conflicts: Text conflict in mysql-test/r/lock_multi.result Text conflict in mysql-test/t/lock_multi.test Text conflict in mysql-test/t/mysqldump.test Text conflict in sql/item_strfunc.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/parse_file.cc Text conflict in sql/slave.cc Text conflict in sql/sp.cc Text conflict in sql/sp_head.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.cc Text conflict in sql/sql_crypt.cc Text conflict in sql/sql_db.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_parse.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_view.cc Text conflict in storage/innobase/handler/ha_innodb.cc Text conflict in storage/myisam/mi_packrec.c Text conflict in tests/mysql_client_test.c Updates to Innobase, taken from main 5.1: bzr: ERROR: Some change isn't sane: File mysql-test/r/innodb-semi-consistent.result is owned by Innobase and should not be updated. File mysql-test/t/innodb-semi-consistent.test is owned by Innobase and should not be updated. File storage/innobase/handler/ha_innodb.cc is owned by Innobase and should not be updated. File storage/innobase/ibuf/ibuf0ibuf.c is owned by Innobase and should not be updated. File storage/innobase/include/row0mysql.h is owned by Innobase and should not be updated. File storage/innobase/include/srv0srv.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.ic is owned by Innobase and should not be updated. File storage/innobase/lock/lock0lock.c is owned by Innobase and should not be updated. File storage/innobase/page/page0cur.c is owned by Innobase and should not be updated. File storage/innobase/row/row0mysql.c is owned by Innobase and should not be updated. File storage/innobase/row/row0sel.c is owned by Innobase and should not be updated. File storage/innobase/srv/srv0srv.c is owned by Innobase and should not be updated. File storage/innobase/trx/trx0trx.c is owned by Innobase and should not be updated. (Set env var 'ALLOW_UPDATE_INNOBASE_OWNED' to override.)
| * \ \ \ Upmerge the fix of an error message typoJoerg Bruehe2009-04-141-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | (in "scripts/make_win_bin_dist") from 5.0 into 5.1
| | * | | 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.
| * | | | Merge a tool change needed for cluster ("CGE") builds Joerg Bruehe2009-04-141-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | to achieve the correct package names ("scripts/make_binary_distribution.sh").
| | * | | | Handle the two part version number of cluster buildsJoerg Bruehe2009-03-311-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (general server part + NDB part) automatically when creating a binary package, include only the NDBpart in the package (file) name. scripts/make_binary_distribution.sh: The "version" string of a cluster build contains information about both the general server part and the NDB part. This is intentional, but it isn't suitable for the package file name. When packaging a binary build, the script now detects whether it is dealing with a cluster build or not. If it is a cluster build, the script now removes the server part from the version number, leaving the NDB part. Example: "5.1.31-ndb-6.4.2" -> "6.4.2" so packages are named like "mysql-cluster-gpl-6.4.2-linux-i686-glibc23.tar.gz"
* | | | | | The arguments to use for ps on Mac OS X were mis-detected by the mysql_zapJim Winstead2009-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | utility. (Bug #41883, patch by Nicklas Westerlund)
* | | | | | mysqld_safe could generate filenames with spaces and then didn't properlyJim Winstead2009-05-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quote them in later use. (Bug #33685, based on a patch by Hartmut Holzgraefe)
* | | | | | Add explanation of the possible -s values for mysqldumpslow. (Bug #35663,Jim Winstead2009-05-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | based on a contribution by Ask Bjørn Hansen)
* | | | | | Add support for wildcards in mysql_convert_table_format, and addJim Winstead2009-04-281-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | short options for all of the long options. (Bug #30373, original contribution by Tobias Asplund)
* | | | | | mysqld_multi still had mentions of safe_mysqld instead of mysqld_safe,Jim Winstead2009-04-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as well as some unclear example paths. (Bug #28094)
* | | | | | Update list of sorting options in mysqldumpslow (Bug #20454)Jim Winstead2009-04-281-2/+2
| | | | | |
* | | | | | Check for MEMORY, HEAP, and BLACKHOLE in mysql_convert_table_format whenJim Winstead2009-04-281-13/+13
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preventing a change that would result in table data loss. (Bug #27149) Also updated mysql_convert_table_format to use --engine as the documentation claimed, and use the engine terminology throughout instead of the obsolete 'table type'.
* | | | | Merge from 5.0-bugteamStaale Smedseng2009-04-281-30/+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.
* | | | | Merge revert of bug32136 into 5.1.Chad MILLER2009-04-021-5/+0
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | 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.
* | | Bug #39852 bug in mysql_setpermissionStaale Smedseng2009-03-311-1/+1
| | | | | | | | | | | | | | | | | | mysql_setpermission is modified to honor the $db variable as suggested when doing a REVOKE ALL for menu option 7.
* | | Fix several quoting problems, and clean up IFS on failure in my_which().Chad MILLER2009-03-161-8/+12
| | |
* | | Bug#39326: mysqld_safe doesn't use --basedir value in search of \Chad MILLER2009-03-161-7/+21
| |/ |/| | | | | | | | | | | | | my_print_defaults Now use basedir to set an unset ledir and to find the location of my_print_defaults .
* | Bug#36540: CREATE EVENT and ALTER EVENT statements fail with large server_idDavi Arnaut2009-03-112-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that creating a event could fail if the value of the variable server_id didn't fit in the originator column of the event system table. The cause is two-fold: it was possible to set server_id to a value outside the documented range (from 0 to 2^32-1) and the originator column of the event table didn't have enough room for values in this range. The log tables (general_log and slow_log) also don't have a proper column type to store the server_id and having a large server_id value could prevent queries from being logged. The solution is to ensure that all system tables that store the server_id value have a proper column type (int unsigned) and that the variable can't be set to a value that is not within the range. mysql-test/r/events_bugs.result: Add test case result for Bug#36540 mysql-test/r/log_tables.result: Update column type. mysql-test/r/system_mysql_db.result: Update column type. mysql-test/r/variables.result: Add test case result for server_id value range. mysql-test/suite/sys_vars/r/server_id_basic_64.result: Update test case results. mysql-test/t/events_bugs.test: Add test case for Bug#36540 mysql-test/t/log_tables.test: Fix column type. mysql-test/t/variables.test: Add test case for server_id value range. scripts/mysql_system_tables.sql: Columns that store the server_id value must be of type INT UNSIGNED, fix event (originator), general_log and slow_log (server_id) tables in accordance. scripts/mysql_system_tables_fix.sql: Columns that store the server_id value must be of type INT UNSIGNED, fix event (originator), general_log and slow_log (server_id) tables in accordance. sql/mysqld.cc: Set min and max values for the server_id variable. Unfortunately we can't easily change server_id variable type from ulong to uint32 because of the sys_var classes.
* | automergeTatiana A. Nurnberg2009-02-241-2/+2
|\ \ | |/
| * 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.
* | Auto-merge 5.1-build -> 5.1-bugteamTimothy Smith2009-02-071-1/+8
|\ \
| * \ Merge from mysql-5.1.31-releaseunknown2009-02-051-1/+8
| |\ \
| | * | Incorrect test if "--short-product-tag=" was given or notMySQL Build Team2009-01-191-1/+1
| | | |
| | * | Fixed typoMySQL Build Team2009-01-171-1/+1
| | | |
| | * | Added option "--short-product-tag=<string>" to "make_binary_distribution.sh",MySQL Build Team2009-01-151-1/+8
| | | | | | | | | | | | | | | | | | | | to enable product name and server suffix to differ.
* | | | Merge from 5.0-bugteam.Chad MILLER2009-02-041-0/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | 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#41828: mysql_install_db misses mysqld options when using --basedirJonathan Perkin2009-01-061-3/+48
| |/ |/| | | | | | | | | * pass --languages to mysqld when using --basedir * improve error messages when unable to find files in basedir
* | Bug#34025: mysql_config is not returning -ldl lib flag needed when using ↵Tatiana A. Nurnberg2008-11-103-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedded server mysql_config did not output -ldl (or equivalent) when needed for --libmysqld-libs, so its output could be insufficient to build an application using the embedded server. LIBDL was already set in configure; it's now propagated all the way into the relevant mysql_config scripts. scripts/Makefile.am: We "manually" replace configure's constants in .sh scripts using sed, so AC_SUBST() alone is not good enough. Add LIBDL to the substitution list; we'll be needing it for mysql_config --libmysqld-libs scripts/mysql_config.pl.in: Add LIBDL (usually -ldl) to output of mysql_config --libmysqld-libs (perl version) scripts/mysql_config.sh: Add LIBDL (usually -ldl) to output of mysql_config --libmysqld-libs (shell version)
* | Merge fix for bug 34129.Chad MILLER2008-10-141-1/+1
|\ \
| * | In mysqldumpslow, consume arbitrary whitespace in the Query_time line.Chad MILLER2008-10-141-1/+1
| | |
| * | Bug#34129: mysqldumpslow does not aggregate timesChad MILLER2008-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | Query times were changed to contain subsecond information after a decimal. Change the capturing regex to account for decimal also.
* | | Merge fix for Bug#35754.Chad MILLER2008-10-031-2/+2
|\ \ \ | | |/ | |/|
View Lorry Controller Status