summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2015-01-213-10/+4
|\
| * MDEV-6220 mysqldump will not backup database with --flush-logs parameter and ↵Sergei Golubchik2015-01-191-0/+1
| | | | | | | | | | | | | | | | log_error my.cnf parameter defined some checks were "if [ -n "$err_log" ]", others were "if [ $want_syslog -eq 0 ]", so when both are set, error log file was only partially initialized. To avoid this ambiguity we reset want_syslog when error log file is used.
| * mysql-5.5.41 mergeSergei Golubchik2014-12-192-10/+3
| |\
| | * Bug #14486004 MYSQL_SETPERMISSION DOES NOT QUOTE USER NAMESArun Kuruvila2014-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: Certain operations using the client tool 'mysql\_setpermisson' which uses username of the format "xxx-yyy" results in a syntax error. Analysis: The user name variable ( $user ) was not quoted properly in the 'mysql\_setpermission' script. As a result, while granting user privileges for a user with username of the format 'xxx-yyy', results in a syntax error. Fix: The escape sequence has been applied for the user variable in the script file. Note: Test case is not added for this fix. 'mysql\_setpermission' executable resides in different directories on pb2 machines and on local boxes. Hence the test case cannot be made generic.
| | * Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-131-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE Backport from mysql-5.6 to mysql-5.5
| | * Bug #19361402 - ADD --MANUAL-LLDB OPTION TO MYSQL-TEST-RUN.PL, contributedSayantan Dutta2014-09-021-0/+0
| | |
| * | MDEV-6891: Update company nameNirbhay Choubey2014-12-121-2/+2
| | |
* | | Fixed compiler warningsMichael Widenius2014-12-191-1/+1
| | | | | | | | | | | | | | | scripts/mysql_system_tables.sql: Removed DEFAULT from a blob definition as this can cause problems.
* | | MDEV-6891: Update company nameNirbhay Choubey2014-12-121-2/+2
| | |
* | | 5.5 mergeSergei Golubchik2014-11-191-2/+2
|\ \ \ | |/ /
| * | MDEV-7028 mysql_config produces invalid cflags (was: udf_example.c couldn't ↵Sergei Golubchik2014-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | compile) two bugs in mysql_config: 1. flags like -Werror=format were not stipped out 2. one-pass s/// command was used that could not remove all matching flags (e.g. s/ A */ /g cannot remove all A's in " 1 2 A A A A A 4 5 ")
* | | MDEV-4399 mysql_secure_installation reports error in find_mysql_clientSergei Golubchik2014-11-181-3/+2
| | | | | | | | | | | | | | | 1. remove find_mysql_client (from a bad merge) 2. use $mysql_command
* | | MDEV-6779 Help file problems in 10.0.13Sergei Golubchik2014-11-181-0/+2
| | | | | | | | | | | | disable binlogging when loading help tables
* | | MDEV-6779 Help file problems in 10.0.13Sergei Golubchik2014-11-181-0/+7
| | | | | | | | | | | | update mysql_system_tables_fix.sql to match mysql_system_tables.sql
* | | 5.5.40+ mergeSergei Golubchik2014-10-092-0/+18
|\ \ \ | |/ /
| * | remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40Sergei Golubchik2014-10-082-5/+101
| | |
| * | mysql-5.5.40Sergei Golubchik2014-10-061-0/+17
| |\ \ | | |/
| | * Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, ↵Venkata Sidagam2014-08-011-2/+0
| | | | | | | | | | | | | | | | | | 5.6.15+, 5.7.3+ Follow-up patch. Removed unwanted code.
| | * Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, ↵Venkata Sidagam2014-08-011-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.6.15+, 5.7.3+ Description: mysql_upgrade fails with below error, when there are duplicate entries(like 'root'@'LOCALHOST' and 'root'@'localhost') in mysql.user table. ERROR 1062 (23000) at line 1140: Duplicate entry 'localhost-root' for key 'PRIMARY' FATAL ERROR: Upgrade failed Analysis: As part of the bug 12917151 fix we are making all the hostnames as lower case hostnames. So, this has been done by mysql_upgrade. In case of above mentioned duplicate entries mysql_upgrade tries to change hostname to lowercase. Since there is already 'root'@'localhost' exists. it is failing with "duplicate entry" error. Fix: Since its a valid error failure. We are making the error more verbose. So, that user will delete the duplicate errors manually. Along with existing error we are printing below error as well. ERROR 1644 (45000) at line 1153: Multiple accounts exist for @user_name, @host_name that differ only in Host lettercase; remove all except one of them
| * | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-022-101/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. move cflags/libs cleanup from mysql_config.sh (runtime) to for_client.cmake (build time). Include/library paths are still calculated at runtime (they depend on the location of mysql_config) 2. Use cleaned-up cflags/libs to generate mariadb.pc 3. remove obsolete @expansions@ from mysql_config (for variables that are never set in cmake files)
* | | fix out-of-source buildsSergei Golubchik2014-10-041-0/+1
| | |
* | | 5.5 mergeSergei Golubchik2014-09-161-0/+3
|\ \ \ | |/ /
| * | for mysql-test: fix mysqlhotcopy script to return a predictable exit codeSergei Golubchik2014-09-161-0/+3
| | |
* | | 5.5.39 mergeSergei Golubchik2014-08-074-19/+18
|\ \ \ | |/ /
| * | mysql-5.5.39 mergeSergei Golubchik2014-08-023-3/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | ~40% bugfixed(*) applied ~40$ bugfixed reverted (incorrect or we're not buggy) ~20% bugfixed applied, despite us being not buggy (*) only changes in the server code, e.g. not cmakefiles
| | * Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.Praveenkumar Hulakund2014-06-271-0/+0
| | | | | | | | | | | | | | | Post-push patch. Changing file permission of "scripts/mysqlaccess.conf".
| | * Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.Praveenkumar Hulakund2014-06-271-0/+0
| | | | | | | | | | | | | | | | | | Backporting patch committed for bug 18008907 to 5.5 and 5.6.
| | * Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BITTerje Rosten2014-06-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#16415173 CRLF INSTEAD OF LF IN SQL-BENCH SCRIPTS Correct perms and converts from Windows style to UNIX style line endings on some files. Fix perms on installed ini files. (MySQL 5.5 version)
| | * Backport from trunk:Tor Didriksen2014-05-122-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #18382225 MYSQL_CONFIG CAN'T HANDLE RELOCABLE PACKAGES THAT USES "LIB64" OR "-64" SUFFIX 'lib' is hardcoded into mysql_config, so 'cmake -DINSTALL_LIBDIR=lib64' will not work. Use INSTALL_LIBDIR when generating mysql_config. mysql_config may be renamed to e.g. mysql_config-32, fix the basedir pattern matching.
| * | MDEV-5958 Inconsitent handling of invalid arguments for mysqld_safeSergei Golubchik2014-07-231-16/+13
| | | | | | | | | | | | | | | issue an error for unrecognized options in the [mysqld_safe] section of my.cnf but don't abort the script
* | | MDEV-5151 mysql_upgrade does not fix "last_update" in "mysql.innodb_table_stats"Sergei Golubchik2014-08-051-0/+10
| | | | | | | | | | | | fix_privilege_tables: use ALTER TABLE to fix last_update column in innodb stat tables
* | | cleanup (move ALTER TABLE for comment to be applicable again)Sergei Golubchik2014-08-051-7/+6
| | |
* | | MDEV-6352 [PATCH] mysql_config prints usage to stdout and exit with 0 if run ↵Sergei Golubchik2014-08-031-4/+4
| | | | | | | | | | | | with unknow option
* | | MDEV-6485 Hard-coded paths in the source cannot be opt-outSergei Golubchik2014-08-034-36/+20
| | | | | | | | | | | | | | | when looking for my.cnf files: if DEFAULT_SYSCONFDIR (or INSTALL_SYSCONFDIR) is specified (for rpms it always is), use that instead of hardcoded /etc path.
* | | 5.5.38 mergeSergei Golubchik2014-06-062-2/+2
|\ \ \ | |/ /
| * | MDEV-5485 Minor man pages formatting issuesSergei Golubchik2014-05-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-6281 Typo in mysql_install_db scripts and collateral changes: * remove mysql_tableinfo.1 and references to it (there's no mysql_tableinfo) * for debian: create manpages for mysqlrepair, mysqlanalyze, mysqloptimize (as symlinks for mysqlcheck.1, just as executables are symlinks to mysqlcheck) * remove mysqlmanager.8 and references to it * correct "very long line" error in mysqladmin.1 * simplify and fix table formatting in mysqlbinlog.1 and mysqldump.1 * fix a typo in the help text in mysql_install_db * aria_chk: say "for Linux on x86_64", like other tools do (not "for Linux at x86_64") * add simple manpages for aria_* utilities
* | | MDEV-6243 mysql_install_db or mysql_upgrade fails when default_engine=archiveSergei Golubchik2014-06-051-10/+18
| | | | | | | | | | | | | | | don't use the default storage engine for mysql.gtid_slave_pos, prefer innodb. but alter it to myisam in mtr, because many tests run without innodb.
* | | 5.5 mergeSergei Golubchik2014-05-098-15/+28
|\ \ \ | |/ /
| * | MDEV-5152 mysql_config includes -lprobes_mysql but mo such library installedSergei Golubchik2014-04-081-4/+6
| | | | | | | | | | | | | | | when converting /a/full/path/to/a/file.ext to -lfile ignore all files with non-library extenstions.
| * | MDEV-6068 Upgrade removes all changes to 'mysql' databaseElena Stepanova2014-04-111-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | mysql_upgrade overrode some of the custom changes made to system tables in order to increase user name length. Make ALTER statements involving the affected columns take into account length changes, as per https://mariadb.com/kb/en/create-user/#user-names
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-278-10/+22
| |\ \ | | |/
| | * Bug#18235669 MYSQL_CONFIG TO PROVIDE R FLAG ON SOLARISTor Didriksen2014-02-253-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mysql_config --libs' outputs -L/path/to/library on SunOS we also want it to output '-R/path/to/library' in order to find libraries at runtime. cmake/libutils.cmake: Add an informational message, to show dependencies on OS libraries.
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-175-0/+5
| | | | | | | | | | | | | | | to copyright header.
| | * Bug#11751526 / Bug#42421 - MYSQL_INSTALL_DB.PL NOT RELOCATABLE ON WINDOWSKent Boortz2014-02-031-3/+3
| | | | | | | | | | | | | | | Corrected how to find "resolveip"
* | | MDEV-6095 replicate- filters for slaves with a connection name that contain ↵Sergei Golubchik2014-05-051-23/+16
| | | | | | | | | | | | | | | | | | | | | an underscore are ignored Revert revision-id: guilhem@mysql.com-20091118203617-3jfudef971r7bf2y Implement a non-destructive fix instead.
* | | MDEV-6068 Upgrade removes all changes to 'mysql' databaseElena Stepanova2014-04-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 10.0 variation of the problem was that system tables were altered during mysql_upgrade process using old (smaller) column lengths. At the end the tables were altered again, so the structure was restored, but if there were long values before the upgrade, they were truncated. Fixed by using correct column length in alter statements.
* | | 10.0-base mergeSergei Golubchik2014-02-268-23/+23
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-259-25/+25
| |\ \ \ | | |/ /
| | * | errmsg.sys files are located in the builddir, not in the srcdirSergei Golubchik2014-02-171-1/+1
| | | |
| | * | MDEV-5436 mysql_config returns non-zero when running without parametersSergei Golubchik2014-02-172-2/+2
| | | |