summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-3/+2
| | | | | | | | | | | | | MySQL uses two source layouts when building : the bzr layout and the source package layout. The previous fix for bug 35250 contained 1 change that is valid for both modes and a number of changes that are valid only for the bzr source layout. The important thing was to fix the source package layout. And for this the change in configure.in was sufficient. It's not trivial (and not requested by this bug) to support VPATH builds from the bzr trees. This is why the other changes are reverted and the change to fix the VPATH build for source distributions is left intact.
* mergeGeorgi Kodinov2010-03-011-2/+19
|\
| * Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULLDavi Arnaut2010-02-261-2/+19
| | | | | | | | | | | | | | | | | | | | The problem was that the CSV storage engine does not support NULL fields, yet in some early 5.1 version the log tables (general_log and slow_log) were created with null fields. On top of this, when altering a CSV table column, all fields of the table must be NOT NULL otherwise the alteration fails. The solution is to ensure that during upgrade all columns of the log tables are NOT NULL.
* | Bug #51468: mysqld_multi is broken in 5.1.44Georgi Kodinov2010-02-261-1/+0
|/ | | | Fixed a syntax error in mysqld_multi.sh
* Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-2/+3
| | | | Fixed several (obvious) places that don't work with vpath build.
* configure.inhery.ramilison@sun.com2010-02-171-5/+1
| | | | | | | | - Changes to the banner text - Use older AC_PROG_LIBTOOL (Bug#51009) scripts/mysql_install_db.sh - Changes to banner text
* WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-0/+3
| | | | | | | | | | | Several items said to be deprecated in the 4.1 manual have never been removed. This worklog adds deprecation warnings when these items are used, and warns the user that the items will be removed in MySQL 5.6. A couple of previously deprecation decision have been reversed (see single file comments)
* This is a patch for bug#41569.lars-erik.bjork@sun.com2009-12-031-0/+30
| | | | | | | | | | | | | "mysql_upgrade (ver 5.1) add 3 fields to mysql.proc table but does not set values". mysql_upgrade (ver 5.1) adds 3 fields (character_set_client, collation_connection and db_collation) to the mysql.proc table, but does not set any values. When we run stored procedures, which were created with mysql 5.0, a warning is logged into the error log. The solution to this is for mysql_upgrade to set default best guess values for these fields. A warning is also written during upgrade, to make the user aware that default values are set.
* MergeKent Boortz2009-11-171-1/+1
|\
| * Include the "mysql-test/collections" directory when creating windows ZIP archiveKent Boortz2009-11-171-1/+1
| |
* | auto-mergeTimothy Smith2009-11-042-84/+143
|\ \ | |/
| * 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.
* | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-10-272-1/+5
|\ \ | |/
| * 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).
| * 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.
* | | bug#41546: mysql-stress-run.pl is not packaged on WindowsJonathan Perkin2009-09-301-0/+1
| | | | | | | | | | | | Copy mysql-stress-run.pl into noinstall package.
* | | 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.
* | | | 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.
* | 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
| | | | |
| * | | | 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.
* | | | | | 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.
View Lorry Controller Status