mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
176365 commits 2791 branches 343 tags 1.7 GiB
Commit graph

2319 commits

Author SHA1 Message Date
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
59277a7d83 Moved wsrep_slave_threads to optional settings. 2014-09-24 12:16:09 -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
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
Balasubramanian Kandasamy
34bc0829c3 Add patch mysql-5.5-libmysqlclient-symbols.patch for el7 2014-08-12 14:32:16 +02:00
Balasubramanian Kandasamy
dab1d7d221 Add patch mysql-5.5-libmysqlclient-symbols.patch for el7 2014-08-12 14:32:16 +02:00
Nirbhay Choubey
8358dd53b7 bzr merge -r4346 maria/10.0 (maria-10.0.13) 2014-08-11 23:55:41 -04:00
Sergei Golubchik
6fb17a0601 5.5.39 merge 2014-08-07 18:06:56 +02:00
Nirbhay Choubey
4788577c20 bzr merge -r3997..4010 codership-mysql/5.5 2014-08-06 15:45:53 -04: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
Balasubramanian Kandasamy
77a5517c93 - Merge from mysql-5.5.39-ol7-release branch 
- Reverted version variable
 2014-08-06 09:56:37 +02:00
Balasubramanian Kandasamy
b9bc2bd434 - Merge from mysql-5.5.39-ol7-release branch 
- Reverted version variable
 2014-08-06 09:56:37 +02:00
Nirbhay Choubey
746c755d42 MDEV-6495: local merge from maria-5.5-galera. 2014-08-05 19:00:54 -04:00
Nirbhay Choubey
e4e55f7968 MDEV-6495: innodb_flush_log_at_trx_commit=0 as suggestion 
for galera vs =2

Updated innodb_flush_log_at_trx_commit value in cnfs as per
recommendation.
 2014-08-05 18:55:05 -04:00
Balasubramanian Kandasamy
0bd28ebe2d Updated for el7 regular rpms 2014-08-04 15:56:19 +02:00
Balasubramanian Kandasamy
1a1e904004 Updated for el7 regular rpms 2014-08-04 15:56:19 +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
Sergei Golubchik
1987819281 MDEV-6428 [PATCH] MariaDB start script doesn't realize failure of MariaDB startup 
abort the wait loop if mysqld_safe is not running
 2014-07-26 23:08:38 +02:00
Nirbhay Choubey
e5cea60933 Local merge of patch for MDEV-3896 from maria-5.5-galera. 2014-07-21 17:27:06 -04:00
Nirbhay Choubey
0dadd01750 MDEV-3896: More user-friendly cnf files in MariaDB-Galera rpm/deb 
packages

* Added "galera" as default option group.
* Updated deb/rpm server config files to include mandatory
  and optional settings (as comments) required to configure
  Galera cluster.
 2014-07-17 16:22:01 -04:00
Balasubramanian Kandasamy
94b31b57ac Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fix 2014-07-09 12:39:19 +02:00
Balasubramanian Kandasamy
354e923cfe Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fix 2014-07-09 12:39:19 +02:00
Michael Widenius
258ecf5538 Added Innobase .ic and errmsg-utf8.txt to tagged files 
Fixed compiler warning

storage/connect/tabdos.cpp:
  Fixed compiler warning
support-files/build-tags:
  Added Innobase .ic and errmsg-utf8.txt to tagged files
  Speed up script
 2014-08-14 15:36:48 +03:00
Bjorn Munch
d3625112b1 Unconditionally disable dtrace for rpm, barfs on Oracle dtrace 2014-07-02 09:38:43 +02:00
Bjorn Munch
b631743a9f Unconditionally disable dtrace for rpm, barfs on Oracle dtrace 2014-07-02 09:38:43 +02:00
Sergei Golubchik
afa4c36ca0 cmake: prefer INSTALL(PROGRAMS over INSTALL(FILES 2014-06-26 11:54:12 +02: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
Nirbhay Choubey
a76a6601ec bzr merge -rtag:mariadb-10.0.12 maria/10.0 2014-06-19 13:12:38 -04:00
Sergei Golubchik
f61f36b386 Merge branch '10.0' into 10.1 
Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore
 2014-06-13 16:10:25 +02:00
Nirbhay Choubey
c29cbac2eb bzr merge -r3985..3997 codership/5.5 2014-06-10 17:00:32 -04:00
Nirbhay Choubey
b441c510a7 bzr merge -rtag:mariadb-5.5.38 maria/5.5 2014-06-10 16:04:26 -04:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
759fa19690 don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 and mysqlman.1 2014-06-01 11:23:20 +02:00