Sergei Golubchik
416b811a4a
MDEV-8775 enabling encryption is too error-prone
...
create a "preset" file to enable all encryption options at once
2015-09-09 14:22:30 +02:00
Sergei Golubchik
b6776b3ca5
package new SELinux/AppArmor policies instead of old ones
2015-09-04 10:32:02 +02:00
Monty
dfac82e44d
Fixed failing tests and compiler warnings
...
- UNINIT_VAR() was required for 4.8.3 on openSUSE 13.2
2015-08-18 11:18:58 +03:00
Sergei Golubchik
2db62f686e
Merge branch '10.0' into 10.1
2015-03-07 13:21:02 +01:00
Sergei Golubchik
d7e7862364
Merge branch '5.5' into 10.0
2015-02-18 15:16:27 +01:00
Sergei Golubchik
5dce6aa1fe
Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge
2015-02-12 13:14:55 +01:00
Sergei Golubchik
8e80f91fa3
Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42
2015-02-11 23:50:40 +01:00
Monty
3a3ec744b5
cleanups done as part of adding encryption
...
- Fixed compiler warnings
- Added include/wait_for_binlog_checkpoint.inc, as suggested by JonasO
- Updated 'build-tags' to work with git (Patch by Serg)
2015-02-10 10:21:16 +01:00
Sergei Golubchik
a34fd50ce1
MDEV-7478 log-basename unpredictable behavior in standalone mode
...
* fix /etc/init.d/mysql to use log-basename for pid-filename
* fix mysqld_safe not to force logging-to-file when log-basename is specified
2015-02-09 20:53:36 +01:00
Sergei Golubchik
8e7649867f
Merge 10.0-galera into 10.1
2015-02-06 16:14:23 +01:00
Sergei Golubchik
4b21cd21fe
Merge branch '10.0' into merge-wip
2015-01-31 21:48:47 +01:00
Nirbhay Choubey
7cda4bee0e
maria-10.0.16 merge
...
bzr merge -r4588 maria/10.0
2015-01-26 22:54:27 -05:00
Sergei Golubchik
d9c01e4b4a
5.5 merge
2015-01-21 12:03:02 +01:00
Nirbhay Choubey
919825a3ad
MDEV-7368 : SLES: Failed to start mysql.service: Unit
...
mysql.service failed to load
Added 'systemctl daemon-reload' command in postin and
postun rpm scripts.
2015-01-14 18:26:29 -05:00
Nirbhay Choubey
d9d994089f
MDEV-7368 : SLES: Failed to start mysql.service: Unit
...
mysql.service failed to load
Added 'systemctl daemon-reload' command in postin and
postun rpm scripts.
2015-01-14 18:24:23 -05:00
Nirbhay Choubey
96e505e4b7
MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap)
...
returns code 0 on failure
Modified init script to return with proper exit status for
bootstrap command. [Based on Kenny Rasschaert's suggestion]
2014-12-20 19:58:54 -05:00
Sergei Golubchik
a978bdda1e
mysql-5.5.41 merge
2014-12-19 11:35:44 +01:00
Nirbhay Choubey
3bb02f3e6d
bzr merge -rtag:mariadb-10.0.15 maria/10.0
2014-12-05 12:33:02 -05:00
Tor Didriksen
dd4f852953
Bug#20009543 SUPPORT-FILES/BUILD-TAGS TRANSITION TO GIT
...
Use 'git ls-files' to find source files for etags.
2014-11-12 11:11:10 +01:00
Balasubramanian Kandasamy
b821be7df5
Rpm 4.9 and newer is more strict regarding weekday in %changelog
2014-10-23 06:56:47 +02:00
Balasubramanian Kandasamy
5057f47ed9
Rpm 4.9 and newer is more strict regarding weekday in %changelog
2014-10-23 06:56:47 +02:00
Balasubramanian Kandasamy
54fd994a5d
Fix changelog entries build failure
2014-10-21 16:19:47 +02:00
Balasubramanian Kandasamy
347234db90
Fix changelog entries build failure
2014-10-21 16:19:47 +02:00
Sergei Golubchik
f62c12b405
Merge 10.0.14 into 10.1
2014-10-15 12:59:13 +02:00
Sergei Golubchik
5ca5f92a1d
MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config
2014-10-11 18:53:06 +02:00
Sergei Golubchik
7f5e51b940
MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)
...
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
2014-10-11 18:53:06 +02:00
Sergei Golubchik
1b75bed00f
5.5.40+ merge
2014-10-09 10:30:11 +02:00
Sergei Golubchik
dbda20caff
remove mariadb.pc file again, it cannot be added in a GA version
2014-10-08 09:35:00 +02:00
Sergei Golubchik
e73e1e7c7a
packaging issues:
...
* skip debian 44_scripts__mysql_config__libs.dpatch it does not apply anymore
(and anyway it would not work for a static library)
* fix the path for install(mariadb.pc)
2014-10-07 16:21:53 +02:00
Sergei Golubchik
1ddfce4840
mysql-5.5.40
2014-10-06 19:53:55 +02:00
Sergei Golubchik
604b653394
MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config
...
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)
2014-10-02 16:58:26 +02:00
Sergei Golubchik
3620910eea
cleanup: galera merge, simple changes
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
023366e6eb
Moved wsrep_slave_threads to optional settings.
2014-09-24 12:17:29 -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
Jan Lindström
5a684f8291
Fix typo.
2014-08-28 07:01:06 +03:00
Jan Lindström
eff5ef77dd
Rule for configure wsrep-notify was missing.
2014-08-28 06:49:58 +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
Balasubramanian Kandasamy
c2fc7d39b2
Add my.cnf.d to regular rpm for EL7 build
2014-08-20 09:46:38 +02:00
Balasubramanian Kandasamy
010ea6ccc6
Add my.cnf.d to regular rpm for EL7 build
2014-08-20 09:46:38 +02:00
Nirbhay Choubey
857abf1481
bzr merge -r4104..4120 codership/5.6/
2014-08-12 14:05:44 -04:00
Balasubramanian Kandasamy
94f265ba2c
Corrected typo
2014-08-12 19:37:49 +02:00
Balasubramanian Kandasamy
9e111f6a2a
Corrected typo
2014-08-12 19:37:49 +02:00
Balasubramanian Kandasamy
e8afbf1e38
Experimental testing
2014-08-12 18:55:05 +02:00
Balasubramanian Kandasamy
7b25051e88
Experimental testing
2014-08-12 18:55:05 +02:00
Balasubramanian Kandasamy
c744cc960f
Experimental testing for patch
2014-08-12 18:26:46 +02:00
Balasubramanian Kandasamy
09f52fc063
Experimental testing for patch
2014-08-12 18:26:46 +02:00
Balasubramanian Kandasamy
414c596fee
Added my.cnf.d directory, removed mysql-5.5-libmysqlclient-symbols.patch
2014-08-12 16:53:31 +02:00
Balasubramanian Kandasamy
a1538ec5f0
Added my.cnf.d directory, removed mysql-5.5-libmysqlclient-symbols.patch
2014-08-12 16:53:31 +02:00
