summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Fix fix_priv_tables.test: make mysql_system_tables_fix.sql to not modify user...Sergey Petrunya2013-07-041-0/+3
* Fix typo in scripts/mysql_system_tables_fix.sqlSergey Petrunya2013-07-041-1/+1
* MDEV-4058unknown2013-06-271-4/+3
* Fixed some merge issues:Michael Widenius2013-06-182-7/+8
* More merge fixes:Michael Widenius2013-06-164-58/+160
* 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 n...Sergei Golubchik2013-01-201-1/+1
| | * mysql-5.5.29 mergeSergei Golubchik2013-01-151-23/+25
| | |\
| | | * Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | | |\
| | | * | Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FOR 5.5 ALLWAYS SETS PLUGIN_DIR Georgi Kodinov2012-08-271-23/+25
| | | * | Bug #14181049: MYSQL_INSTALL_DB.PL CREATES EMPTY SYSTEM TABLES FOR MYSQL Georgi Kodinov2012-08-241-3/+18
| | * | | 5.3 mergeSergei Golubchik2013-01-153-1/+73
| | |\ \ \
| | | * \ \ 5.2->5.3 mergeSergei Golubchik2013-01-103-1/+73
| | | |\ \ \
| | | | * \ \ 5.1 mergeSergei Golubchik2013-01-103-1/+73
| | | | |\ \ \
| | | | | * \ \ mysql-5.1.67 mergeSergei Golubchik2013-01-093-4/+74
| | | | | |\ \ \
| | | | | | * \ \ Automerge into main 5.1Joerg Bruehe2012-10-191-3/+18
| | | | | | |\ \ \ | | | | | | | |_|/ | | | | | | |/| |
| | | | | | | * | Backport this change from MySQL 5.5 to 5.1:Joerg Bruehe2012-09-111-3/+18
| | | | | | * | | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | | | | | |/ /
| | * | | | | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-3/+3
| | * | | | | | Fixed problem with failing mysql_upgrade when proc table was not correct.Michael Widenius2013-01-115-406/+411
* | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-102-4/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.5 -> mwl248Igor Babaev2013-01-081-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Automatic mergeMichael Widenius2012-12-161-4/+4
| | |\ \ \ \ \ \
| | | * | | | | | Removed extra '+' from some lines (remains of old merge)Michael Widenius2012-12-141-4/+4
| * | | | | | | | Changed the names of the system tables for statistical data:Igor Babaev2012-12-051-3/+3
| * | | | | | | | Merge 5.5->mwl248Igor Babaev2012-12-043-8/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+6
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge 5.5->5.5-mwl248.Igor Babaev2012-08-292-1944/+2005
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-262-5/+6
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Changed the type of all double columns in the system statistical tablesIgor Babaev2012-06-251-2/+2
| | * | | | | | | | | | MergeIgor Babaev2012-06-011-1/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-114-13/+107
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-092-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+5
* | | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-183-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-222-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-092-8/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-082-8/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-062-8/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | | | MDEV-3826 compilation of client programs fail: m_string.h tries to include <m...Sergei Golubchik2012-11-151-6/+5
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | MDEV-3816 init-file stops getting executed if a long enough line is encounter...Sergei Golubchik2012-12-161-6/+31
* | | | | | | | | | | | | | | merge with 5.5Sergei Golubchik2012-11-034-48/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix the incorrect mergeSergei Golubchik2012-10-191-2/+3
| * | | | | | | | | | | | | | 5.3 mergeSergei Golubchik2012-10-181-22/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | mergeSergei Golubchik2012-09-271-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | mergeSergei Golubchik2012-09-261-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | always force the language in mysql_install_dbSergei Golubchik2012-09-261-1/+3
| | * | | | | | | | | | | | | mergeSergei Golubchik2012-09-241-21/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
View Lorry Controller Status