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
Balasubramanian Kandasamy
f1e23d73d5
Added fix Provides for Bug#17211588
2013-08-16 16:41:20 +02:00
Balasubramanian Kandasamy
7e00382970
Added fix Provides for Bug#17211588
2013-08-16 16:41:20 +02:00
Sergei Golubchik
97e640b9ae
5.5 merge
2013-07-17 21:24:29 +02:00
Sergei Golubchik
005c7e5421
mysql-5.5.32 merge
2013-07-16 19:09:54 +02:00
Seppo Jaakola
db0cfba638
Merged with lp:maria revision #3766
2013-07-13 13:30:03 +03:00
Seppo Jaakola
0a9216835f
Initial merge result with mariaDB 10: lp:maria
2013-07-13 13:01:13 +03:00
Balasubramanian Kandasamy
66aad1a94d
Updated spec file for Bug#17080138
2013-07-10 19:14:41 +02:00
Balasubramanian Kandasamy
dc8d01654b
Updated spec file for Bug#17080138
2013-07-10 19:14:41 +02:00
Sergey Petrunya
ef47cc1f09
[SHOW] EXPLAIN UPDATE/DELETE, code re-structuring
...
- Merge with 10.0-base
2013-06-27 18:28:14 +04:00
Balasubramanian Kandasamy
1cfa4eb045
Updated copyright year in the spec file
2013-06-27 10:08:30 +02:00
Balasubramanian Kandasamy
cacac93dfd
Updated copyright year in the spec file
2013-06-27 10:08:30 +02:00
Balasubramanian Kandasamy
ddeab5e495
- Spec file cleanup for 5.5.33 release to resolve rpm dependencies bugs
...
Bug16785036 - RPM REQUIRES: MISSING PACKAGES ON RHEL 6 (AND PROBABLY 5)
Bug 16878042 - CANNOT KEEP SEVERAL MAJOR VERSIONS OF MYSQL IN THE SAME YUM REPOSITORY
2013-06-27 09:18:48 +02:00
Balasubramanian Kandasamy
9afde3eb5c
- Spec file cleanup for 5.5.33 release to resolve rpm dependencies bugs
...
Bug16785036 - RPM REQUIRES: MISSING PACKAGES ON RHEL 6 (AND PROBABLY 5)
Bug 16878042 - CANNOT KEEP SEVERAL MAJOR VERSIONS OF MYSQL IN THE SAME YUM REPOSITORY
2013-06-27 09:18:48 +02:00
