mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
176612 commits 2778 branches 343 tags 1.6 GiB
Commit graph

2319 commits

Author SHA1 Message Date
Sergei Golubchik
fa3f8a18b2 mysql-5.5.34 merge 
(some patches reverted, test case added)
 2013-11-19 13:16:25 +01:00
Sergei Golubchik
4157185f24 10.0-base merge 2013-11-13 23:03:48 +01:00
Sergei Golubchik
bdd883ed9a 5.5. merge 2013-11-13 14:07:58 +01:00
Sergei Golubchik
6971eaf3f0 MDEV-5030 RPM installation not running mysql_install_db if datadir exists 
before running mysql_install_db check for the existence
of $datadir/mysql, not simply $datadir ($datadir might be mounted on
a separate device - exists, but empty)
 2013-11-11 09:31:05 +01:00
Balasubramanian Kandasamy
fc98c60f51 Merge 5.1 => 5.5 2013-10-30 04:12:24 +01:00
Balasubramanian Kandasamy
ef2238b88e Merge 5.1 => 5.5 2013-10-30 04:12:24 +01:00
Balasubramanian Kandasamy
d73f2a8224 Removed non gpl file docs/mysql.info from community packages 2013-10-30 04:07:07 +01:00
Balasubramanian Kandasamy
3d553c27b6 Removed non gpl file docs/mysql.info from community packages 2013-10-30 04:07:07 +01:00
Sergey Petrunya
1e36cbfa39 MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE 
- Merge with 10.0-base
 2013-10-15 11:51:41 +04:00
Sergey Petrunya
e5d13c1567 Merge 10.0-base -> 10.0 2013-10-16 13:38:42 +04:00
Seppo Jaakola
255e20a175 Merged revisions 3418..3424 from mariadb-galera-5.5 2013-10-07 08:57:23 +03:00
Seppo Jaakola
06a7eeb992 Merged revisions 3411..3417 from mariadb-galera-5.5 2013-10-07 00:18:26 +03:00
Jan Lindström
ac5d1d761a Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23 
------------------------------------------------------------
revno: 3921
fixes bug: https://launchpad.net/bugs/1228149
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Mon 2013-09-23 18:29:42 +0300
message:
  References lp:1228149 - fixing typos.
------------------------------------------------------------
revno: 3920
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Fri 2013-09-20 15:43:18 +0400
message:
  References lp:1201893 - remove setenv("WSREP_LOG_DIR") from ha_innodb.cc
------------------------------------------------------------
revno: 3919
tags: wsrep_23.7.6
fixes bug: https://launchpad.net/bugs/1087368
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Thu 2013-09-19 06:00:43 +0300
message:
  References lp:1087368 - fix to preserve the order of options in case --wsrep-new-cluster is i
n the middle of option list
------------------------------------------------------------
revno: 3918
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23\ 
timestamp: Wed 2013-09-18 23:22:55 +0300
message:
  bumped wsrep patch version number to 7.6
------------------------------------------------------------
revno: 3917
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Wed 2013-09-18 20:11:39 +0400
message:
  References lp:1218944 - wsrep_sst_rsync now recognizes log_group_home_dir
------------------------------------------------------------
revno: 3916
fixes bug: https://launchpad.net/bugs/1224775
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-09-15 21:29:57 +0300
message:
  References lp:1224775 - reworked wsrep_recover to create temporary log file in $DATADIR. Plus
 cleaned up that function slightly.
 2013-09-26 17:51:01 +03:00
Sergei Golubchik
ed2c573451 update /etc/my.cnf.d/server.cnf to say 10.0, not 5.5 2013-09-25 19:41:28 +02:00
Sergei Golubchik
4ec2e9d7ed 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00
Sergei Golubchik
909775a762 mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
Sergei Golubchik
62643f81e6 merge with 5.5-tokudb tree. In particular: 
* add TokuDB, together with the ft-index library
* cmake support, auto-detecting whether tokudb can be built
* fix packaging - tokudb-engine.rpm, deb
* remove PBXT
* add jemalloc
* the server is built with jemalloc by default even if TokuDB is not built
* documentation files in RPM are installed in the correct location
* support for optional deb packages (tokudb has specific build requirements)
* move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient)
* correct mariadb-test.deb to be not architecture-independent
* fix out-of-tree builds to never modify in-tree files
* new handler::prepare_index_scan() method
 2013-09-10 23:02:25 +02:00
Sergei Golubchik
265bbf5fe1 introduce sysconf2dir, install tokudb.conf there, both in rpm and deb 2013-09-10 22:59:18 +02:00
Balasubramanian Kandasamy
07ffbdc2c9 Reverted the changes to spec file to ignore mysqld_safe.pid file, updated the logic to get the correct count of PID files 2013-09-09 20:07:12 +02:00
Balasubramanian Kandasamy
9b87a53a10 Reverted the changes to spec file to ignore mysqld_safe.pid file, updated the logic to get the correct count of PID files 2013-09-09 20:07:12 +02:00
Balasubramanian Kandasamy
543b6e0224 Reverted the changes to spec file, updated the logic to get the correct count of PID files 2013-09-09 19:49:44 +02:00
Balasubramanian Kandasamy
5da2ffc7c9 Reverted the changes to spec file, updated the logic to get the correct count of PID files 2013-09-09 19:49:44 +02:00
Hery Ramilison
199a98ee28 Committing patch from venkata.sidagam@oracle.com for Bug#16776528 2013-09-09 18:58:08 +02:00
Hery Ramilison
efc72ecf40 Committing patch from venkata.sidagam@oracle.com for Bug#16776528 2013-09-09 18:58:08 +02:00
Sergei Golubchik
b838d081ad mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
Hery Ramilison
0daae54fb5 Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a package 2013-09-03 18:37:46 +02:00
Hery Ramilison
ba258c7590 Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a package 2013-09-03 18:37:46 +02:00
Jan Lindström
ba3ff50ab2 Merge 10.0 to galera-10.0 2013-09-03 17:50:36 +03:00
Balasubramanian Kandasamy
9e49de009c Fix to ignore mysqld_safe.pid 2013-08-30 17:14:46 +02:00
Balasubramanian Kandasamy
01c83f0926 Fix to ignore mysqld_safe.pid 2013-08-30 17:14:46 +02:00
Balasubramanian Kandasamy
bb82aecef9 Fix to ignore mysqld_safe.pid 2013-08-30 15:02:16 +02:00
Balasubramanian Kandasamy
bab5007ae3 Fix to ignore mysqld_safe.pid 2013-08-30 15:02:16 +02:00
Sergei Golubchik
6755944d08 remove PBXT 2013-08-30 11:25:49 +02:00
Balasubramanian Kandasamy
1f6434ba3d Corrected the PID_FILE_PATT manipulation 2013-08-30 06:33:02 +02:00
Balasubramanian Kandasamy
5b32f1b6fd Corrected the PID_FILE_PATT manipulation 2013-08-30 06:33:02 +02:00
Balasubramanian Kandasamy
095b6645b0 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:42:55 +02:00
Balasubramanian Kandasamy
52a3029df9 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:42:55 +02:00
Balasubramanian Kandasamy
e2c77ad949 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:33:28 +02:00
Balasubramanian Kandasamy
587ae13b24 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:33:28 +02:00
Sergey Petrunya
662bfed027 [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring 
- Merge with current 10.0-base
 2013-08-24 00:46:49 +04:00
Balasubramanian Kandasamy
6613734b1a Corrected Date in the changelog 2013-08-22 16:51:30 +02:00
Balasubramanian Kandasamy
f7e0cc8204 Corrected Date in the changelog 2013-08-22 16:51:30 +02:00
Balasubramanian Kandasamy
9d9e54d380 Removed bugnumber from the changelog and updated description 2013-08-22 14:58:13 +02:00
Balasubramanian Kandasamy
e5a055bd5c Removed bugnumber from the changelog and updated description 2013-08-22 14:58:13 +02:00
Seppo Jaakola
fca065f95c Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903 2013-08-21 17:17:30 +03:00
Seppo Jaakola
4222b2520b Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
Balasubramanian Kandasamy
fcc0011438 Reverted Release version 2013-08-20 12:21:35 +02:00
Balasubramanian Kandasamy
198f3b466c Reverted Release version 2013-08-20 12:21:35 +02:00
Balasubramanian Kandasamy
1e904e36e5 dummy commit 2013-08-16 17:48:54 +02:00
Balasubramanian Kandasamy
a645ecc904 dummy commit 2013-08-16 17:48:54 +02:00