Commit graph

3963 commits

Author SHA1 Message Date
Sergei Golubchik
4bb49d84a9 correct handling on defaults[-extra]-file is SST scripts
pass --defaults-file and --defaults-extra-file
(whatever was specified, or none)
from mysqld down to SST scripts.

parse these options in SST scripts and pass them down
to mysqldump, my_print_defaults, and xtrabackup
2014-10-01 23:38:27 +02:00
Nirbhay Choubey
c916085e27 bzr merge -rtag:mariadb-10.0.14 maria/10.0/ 2014-09-28 20:43:56 -04:00
Nirbhay Choubey
236cc6cd49 wsrep-related changes: removed some unnecessary files & minor modifications. 2014-09-25 20:59:15 -04:00
Nirbhay Choubey
e207e5fe27 Updated config files:
- Removed QC restriction
 - Added bind-address
Fixed file permissions for wsrep_sst_rsync.sh.
Removed some unnecessary files.
2014-09-23 14:33:27 -04:00
Nirbhay Choubey
851e428e4e Updated config files:
- Removed QC restriction
 - Added bind-address
Fixed file permissions for wsrep_sst_rsync.sh.
2014-09-23 14:03:13 -04:00
Sergei Golubchik
7e29c1b539 5.5 merge 2014-09-16 14:03:17 +02:00
Sergei Golubchik
33656e042d for mysql-test: fix mysqlhotcopy script to return a predictable exit code 2014-09-16 13:35:28 +02:00
Sayantan Dutta
863bcdfd89 Bug #19361402 - ADD --MANUAL-LLDB OPTION TO MYSQL-TEST-RUN.PL, contributed 2014-09-02 15:12:55 +05:30
Sayantan Dutta
9fb7de7b65 Bug #19361402 - ADD --MANUAL-LLDB OPTION TO MYSQL-TEST-RUN.PL, contributed 2014-09-02 15:12:55 +05:30
Jan Lindström
ab150128ce MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3880.

    Added a new functions to handler API to forcefully abort_transaction,
    producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
    were added for future possiblity to add more storage engines that
    could use galera replication.
2014-08-27 13:15:37 +03:00
Jan Lindström
df4dd593f2 MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
2014-08-26 15:43:46 +03:00
Sergey Vojtovich
f1c1c04a34 MDEV-4262 - P_S discovery
Discover P_S tables automatically.

Most of this patch is code clean-up:
- removed tests and code responsible for P_S tables correctness verification
- always return error from ha_perfschema::create()
- install/upgrade scripts won't create P_S tables anymore
2014-08-19 15:18:18 +04:00
Nirbhay Choubey
8358dd53b7 bzr merge -r4346 maria/10.0 (maria-10.0.13) 2014-08-11 23:55:41 -04:00
Monty
b4c74e2ab4 Change MySQL -> MariaDB inc scripts 2014-08-09 13:22:01 +03:00
Nirbhay Choubey
f8420992c0 MDEV-6490: mysqldump unknown option --galera-sst-mode
* Merged patches pushed to 10.0.
* Additional fix in wsrep_sst_mysqldump.sh to control use
  of RESET MASTER and mysqldump's galera-sst-mode option based
  on joiner's @@log-bin value.
2014-08-07 18:29:20 -04:00
Sergei Golubchik
6fb17a0601 5.5.39 merge 2014-08-07 18:06:56 +02:00
Nirbhay Choubey
ec91eea8db Local merge of mariadb-5.5.39
bzr merge -r4264 maria/5.5

Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
2014-08-06 14:06:11 -04:00
Sergei Golubchik
053d5edbdc MDEV-5151 mysql_upgrade does not fix "last_update" in "mysql.innodb_table_stats"
fix_privilege_tables: use ALTER TABLE to fix last_update column in innodb stat tables
2014-08-05 14:39:00 +02:00
Sergei Golubchik
aafe43b7e0 cleanup (move ALTER TABLE for comment to be applicable again) 2014-08-05 14:37:05 +02:00
Sergei Golubchik
0661c7329d MDEV-6352 [PATCH] mysql_config prints usage to stdout and exit with 0 if run with unknow option 2014-08-03 18:39:36 +02:00
Sergei Golubchik
91c47e6fdf MDEV-6485 Hard-coded paths in the source cannot be opt-out
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.
2014-08-03 17:13:56 +02:00
Sergei Golubchik
1c6ad62a26 mysql-5.5.39 merge
~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
2014-08-02 21:26:16 +02:00
Venkata Sidagam
81f79aee3c Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+
Follow-up patch. Removed unwanted code.
2014-08-01 17:09:55 +05:30
Venkata Sidagam
7d904273f9 Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+
Follow-up patch. Removed unwanted code.
2014-08-01 17:09:55 +05:30
Venkata Sidagam
ace82cadcd Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 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
2014-08-01 14:18:28 +05:30
Venkata Sidagam
7879b3eefd Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 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
2014-08-01 14:18:28 +05:30
Sergei Golubchik
8fc3724421 MDEV-5958 Inconsitent handling of invalid arguments for mysqld_safe
issue an error for unrecognized options in the [mysqld_safe] section of my.cnf
but don't abort the script
2014-07-23 21:44:35 +02:00
Vicentiu Ciorbaru
c55f5d1add Added default_role column to mysql_system_tables 2014-07-23 14:48:12 +02:00
Nirbhay Choubey
eaa0fe7cf8 MDEV-4728: local merge from maria-5.5-galera. 2014-07-15 01:01:49 -04:00
Nirbhay Choubey
9c3f623777 MDEV-4728: MariaDB can't start while bootup
Introduced safety checks to ensure mysqld_safe terminates
if mktemp fails to create a valid file.
2014-07-15 00:54:29 -04:00
Jan Lindström
b7a5b71fb3 MDEV-6225: Idle replication slave keeps crashing.
Analysis: Based on crashed the buffer pool instance identifier is
not correct on block to be freed. Add LRU list mutex holding
on functions calling free and add additional safety checks.
2014-06-30 14:02:54 +03:00
Praveenkumar Hulakund
f384ba71fb Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.
Post-push patch. Changing file permission of "scripts/mysqlaccess.conf".
2014-06-27 17:17:04 +05:30
Praveenkumar Hulakund
2f6fab4d54 Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.
Post-push patch. Changing file permission of "scripts/mysqlaccess.conf".
2014-06-27 17:17:04 +05:30
Praveenkumar Hulakund
14aa44bb8f Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.
Backporting patch committed for bug 18008907 to 5.5
and 5.6.
2014-06-27 17:04:08 +05:30
Praveenkumar Hulakund
b2c2656b62 Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.
Backporting patch committed for bug 18008907 to 5.5
and 5.6.
2014-06-27 17:04:08 +05:30
Alexey Botchkov
b95ec13553 Revert "MDEV-12 OpenGIS: create required tables: GeometryColumns, related views."
This reverts commit 0bf9fd8929.
2014-06-26 11:37:24 +05:00
Alexey Botchkov
0bf9fd8929 MDEV-12 OpenGIS: create required tables: GeometryColumns, related views.
Scripts added that create OpenGIS-required views and tables they're based upon.
2014-06-26 00:46:21 +05:00
Terje Rosten
410b1dd86d Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BIT
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)
2014-06-25 12:35:50 +02:00
Terje Rosten
5c4937c101 Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BIT
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)
2014-06-25 12:35:50 +02:00
Sergei Golubchik
fb8818c1af Fix CMakeLists.txt for cmake Ninja generator 2014-06-20 09:03:47 +02:00
Nirbhay Choubey
a76a6601ec bzr merge -rtag:mariadb-10.0.12 maria/10.0 2014-06-19 13:12:38 -04:00
Nirbhay Choubey
1fbb70559b MDEV#6316: Fix mysqldump SST method to transfer binlog
state to the joiner

In mysqldump SST, if Galera nodes are started with --log-bin and
-log-slave-updates, the GTID sequence increases as the dump is
played on the joiner, leaving behind the donor.

This patch introduces a new mysqldump option --galera-sst-mode,
which if enabled, would

a) Add command to set off binary logging (log_bin=OFF).
b) Add command to set @@global.gtid_binlog_state to that
   of donor.

This will help in keeping the GTIDs consistent post-SST across
the nodes.
2014-06-16 14:55:14 -04:00
Nirbhay Choubey
c29cbac2eb bzr merge -r3985..3997 codership/5.5 2014-06-10 17:00:32 -04:00
Nirbhay Choubey
90ead99572 bzr merge -r3980..3984 codership/5.5 2014-06-10 16:33:57 -04:00
Nirbhay Choubey
b441c510a7 bzr merge -rtag:mariadb-5.5.38 maria/5.5 2014-06-10 16:04:26 -04:00
Nirbhay Choubey
d3b2e780d6 Updated default load option groups. 2014-06-06 13:49:10 -04:00
Nirbhay Choubey
cc66ae6aae MDEV#6317: Fix rsync SST method to transfer binlog
state to the joiner

* Merged changes to transfer last binlog file from
  codership/5.6.
* Updated load default option groups.
2014-06-06 13:27:15 -04:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
e22c3810f0 MDEV-6243 mysql_install_db or mysql_upgrade fails when default_engine=archive
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.
2014-06-05 09:04:43 +02:00
Nirbhay Choubey
97d8323210 Fix for wsrep_sst_xtrabackup-v2.sh script. 2014-06-02 22:45:41 -04:00