summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.0 to galera-10.0Jan Lindström2013-09-0315-71/+2138
|\
| * MDEV-4865 Change related to --log option/variable was merged partiallySergei Golubchik2013-08-131-4/+2
| | | | | | | | | | Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk (WL#5185 Remove deprecated 5.1 features)
| * 10.0-monty mergeSergei Golubchik2013-07-215-66/+171
| |\ | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| | * MDEV-4757 Change mysql.slow_log.event_time from TIMESTAMP to TIMESTAMP(6)Sergei Golubchik2013-07-151-1/+1
| | |
| | * Fix fix_priv_tables.test: make mysql_system_tables_fix.sql to not modify ↵Sergey Petrunya2013-07-041-0/+3
| | | | | | | | | | | | user.password_expired column.
| | * Fix typo in scripts/mysql_system_tables_fix.sqlSergey Petrunya2013-07-041-1/+1
| | |
| | * MDEV-4058unknown2013-06-271-4/+3
| | | | | | | | | | | | MySQL 5.6.10 performance schema: merge of host_cache table
| | * Fixed some merge issues:Michael Widenius2013-06-182-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | - temporary tables now works - mysql-system_tables updated to not use temporary tables - PASSWORD() function fixed - Support for STATS_AUTO_RECALC, STATS_PERSISTENT and STATS_SAMPLE_PAGES table options
| | * More merge fixes:Michael Widenius2013-06-164-58/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - mdl.cc and mdl.h merged completely - mysql_system_tables*.sql merged completely - Fixed wrong merge of lock_tables - Added some missing functions: - bool THD::notify_shared_lock() - Dynamic_array::pop, Dynamic_array::del - Added MDL_context_owner to THD - Added metadata_locks_hash_instances
| * | 10.0-base mergeSergei Golubchik2013-07-183-5/+5
| |\ \
| | * \ 5.5 mergeSergei Golubchik2013-07-173-4/+4
| | |\ \
| | | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-163-4/+4
| | | |\ \
| | | | * \ Merge of patch for Bug#12671635 from mysql-5.1.Nirbhay Choubey2013-03-211-2/+2
| | | | |\ \
| | | | | * | Bug#12671635 HELP-TABLEFORMAT DOESN'T MATCH HELP-FILESNirbhay Choubey2013-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As current size limit of 'url' field of help_topic table is no longer sufficient for the contents of the fill_help_tables-5.1.sql. So, loading the contents in the table might result in warning (or error with stricter modes). Updated the type for 'url' field of help_topic as well as help_category tables from char(128) to text.
| | | | | * | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-193-3/+3
| | | | | | |
| | | | | * | Updated/added copyright headers.Murthy Narkedimilli2013-02-257-7/+7
| | | | | | |
| | | | * | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-193-3/+3
| | | | | | |
| | * | | | | MDEV-4483: CHANGE MASTER TO master_use_gtid=xxx looses old-style coordinates.unknown2013-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some old code that cleared the position in CHANGE MASTER, it was forgotten to be removed. In addition, add code that saves/restores the old-style position when we nuke the old relay logs as part of GTID slave start. Normally we will not use these, but it could be useful in case the GTID connect fails and user wants to go back to the old-style coordinates.
* | | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-6/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 10.0-base mergeSergei Golubchik2013-06-061-6/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | (without InnoDB - all InnoDB changes were ignored)
| | * | | | | 5.5 mergeSergei Golubchik2013-06-061-6/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-6/+9
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge from mysq-5.1 to mysql-5.5Sujatha Sivakumar2013-02-191-5/+9
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Bug#11746817:MYSQL_INSTALL_DB CREATES WILDCARD GRANTS WHENSujatha Sivakumar2013-02-191-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HOST HAS '_' IN THE HOSTNAME Problem: ======= '_' and '%' are treated as a wildcards by the ACL code and this is documented in the manual. The problem with mysql_install_db is that it does not take this into account when creating the initial GRANT tables: --- cut --- REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y', 'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y', 'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','', 0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost'; --- cut --- If @current_hostname contains any wildcard characters, then a wildcard entry will be defined for the 'root' user, which is a flaw. Analysis: ======== As per the bug description when we have a hostname with a wildcard character in it, it allows clients from several other hosts with similar name pattern to connect to the server as root. For example, if the hostname is like 'host_.com' then the same name is logged in mysql.user table. This allows 'root' users from other hosts like 'host1.com', 'host2.com' ... to connect to the server as root user. While creating the intial GRANT tables we do not have a check for wildcard characters in hostname. Fix: === As part of fix escape character "\" is added before wildcard character to make it a plain character, so that the one and only host with the exact name will be able to connect to the server. scripts/mysql_system_tables_data.sql: while creating default users get the hostname and replace the wildcard characters within the hostname after escaping them.
* | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-133-17/+231
|/ / / / / /
* | | | | | Merge 10.0-base -> 10.0unknown2013-05-281-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-26: Global transaction ID.unknown2013-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change of user interface to be more logical and more in line with expectations to work similar to old-style replication. User can now explicitly choose in CHANGE MASTER whether binlog position is taken into account (master_gtid_pos=current_pos) or not (master_gtid_pos= slave_pos) when slave connects to master. @@gtid_pos is replaced by three separate variables @@gtid_slave_pos (can be set by user, replicated GTIDs only), @@gtid_binlog_pos (read only), and @@gtid_current_pos (a combination of the two, most recent GTID within each domain). mysql.rpl_slave_state is renamed to mysql.gtid_slave_pos to match. This fixes MDEV-4474.
* | | | | | Merge 10.0-base -> 10.0Igor Babaev2013-04-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.0-base -> mwl253Igor Babaev2013-04-152-2/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge 10.0-base -> mwl253.Igor Babaev2013-03-314-7/+14
| |\ \ \ \ \ \
| * | | | | | | Added the type of histogram for mwl #253.Igor Babaev2013-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced double precision height-balanced histograms.
| * | | | | | | Added histogams for table columns.Igor Babaev2013-03-251-1/+1
| | | | | | | |
* | | | | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-172-1/+6
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-152-2/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge of 10.0-mdev26 feature tree into 10.0-base. Global transaction ID is prepended to each event group in the binlog. Slave connect can request to start from GTID position instead of specifying file name/offset of master binlog. This facilitates easy switch to a new master. Slave GTID state is stored in a table mysql.rpl_slave_state, which can be InnoDB to get crash-safe slave state. GTID includes a replication domain ID, allowing to keep track of distinct positions for each of multiple masters.
| | * | | | | | MDEV-26: Global transaction ID.unknown2013-01-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that mysql_install_db can create the rpl_slave_state with InnoDB storage engine.
| | * | | | | | MDEV-26: Global transaction id: Intermediate commit.unknown2012-11-151-0/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now slave can connect to master, sending start position as slave state rather than old-style binlog name/position. This enables to switch to a new master by changing just connection information, replication slave GTID state ensures that slave starts at the correct point in the new master.
* | | | | | | 10.0-base mergeSergei Golubchik2013-04-154-7/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 5.5 mergeSergei Golubchik2013-03-274-7/+14
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-064-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | add --mysqld option to my_print_defaults change server-postin script to use that
| | * | | Automatic mergeMichael Widenius2013-03-011-1/+8
| | |\ \ \
| | | * | | Added support for --crash-script in mysqld_safe.Michael Widenius2013-02-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial cleanup scripts/mysqld_safe.sh: Added support for --crash-script. Don't remove socket file (not needed as server will re-create it if needed) Patch by Eric Bergen storage/maria/ha_maria.h: Removed not existing variable.
| | * | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-2/+2
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Merge of patch for Bug#16046140 from mysql-5.1.Nirbhay Choubey2012-12-271-2/+2
| | | |\ \ | | | | |/
| | | | * Bug#16046140 BIN/MYSQLD_SAFE: TEST: ARGUMENT EXPECTEDNirbhay Choubey2012-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some shell interpreters do not support '-e' test primary to construct conditions. man test 1 (on S10) ...skip... -e file True if file exists. (Not available in sh.) ...skip... Hence, check for the existence of a file using '-e' might result in a syntax error on such shell programs. Fixed by replacing it by '-f'.
* | | | | 10.0-base mergeSergei Golubchik2013-01-319-1508/+1561
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-01-299-434/+513
| |\ \ \ \ | | |/ / /
| | * | | MDEV-3952 Incompatible change in MariaDB-5.5.28a-client rpm adds mytop when ↵Sergei Golubchik2013-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not in MariaDB-5.5.23-client (CentOS 5) Same as for deb: don't add mytop to the client rpm.
| | * | | mysql-5.5.29 mergeSergei Golubchik2013-01-151-23/+25
| | |\ \ \ | | | |/ /
| | | * | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld_safe script did not heed MySQL specific environment variable $UMASK, leading to divergent behavior between mysqld and mysqld_safe. Patch adds an approximation of mysqld's behavior to mysqld_safe, within the bounds dictated by attempt to have mysqld_safe run on even the most basic of shells (proper '70s sh, not just bash with a fancy symlink). Patch also adds approximation of said behavior to mysqld_multi (in perl). (backport) manual merge
| | | * | | Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FOR 5.5 ALLWAYS SETS PLUGIN_DIR Georgi Kodinov2012-08-271-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TO DEFAULT IGNOR The test in mysqld_safe for the presence of the --plugin-dir and assigning a default value to it were performed before the actual argument parsing. This is wrong, as PLUGIN_DIR mysqld_safe code also uses MY_BASEDIR_VERSION to look for version specific plugin directory if present. Fixed by moving the PLUGIN_DIR logic after the parse_arguments() call.
View Lorry Controller Status