mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
178966 commits 2781 branches 343 tags 1.6 GiB
Commit graph

433 commits

Author SHA1 Message Date
Sergei Golubchik
6a1d44339b fix after 5.5 merge, debian packaging 
* oqgraph is in a separate package in 10.0
* sphinx udf is in the ha_sphinx.so
 2015-02-20 14:10:25 +01:00
Nirbhay Choubey
860576f416 Merge branch '10.0' into 10.0-galera 
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0

Conflicts:
	.bzrignore
	storage/xtradb/CMakeLists.txt
 2015-02-18 18:07:45 -05:00
Nirbhay Choubey
3c9137deeb Merge branch '5.5' into 5.5-galera 
Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported

Conflicts:
	.bzrignore
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	storage/tokudb/CMakeLists.txt
	support-files/build-tags
 2015-02-18 17:15:57 -05:00
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
11536f99f1 MDEV-7305 Difficulties building cracklib_password_check 
put cracklib_password_check into a separate package.
build it conditionally on Debian/Ubuntu
 2015-02-17 23:49:56 +01:00
Sergei Golubchik
87eb82d4d5 cleanup: remove old debian/ubuntu names from debian/* files 
namely, remove the code to support:
etch, lenny, hardy, intrepid, jaunty, karmic, maverick, natty
 2015-02-17 23:49:55 +01:00
Sergei Golubchik
f007f82881 MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot 
include oqgraph into deb packages conditionally, just like we do with tokudb
 2015-02-09 20:53:28 +01:00
Sergei Golubchik
bceb0b0be1 MDEV-7151 ha_archive.so missing from .deb 
add missing plugins to debs
 2015-02-08 20:44:46 +01:00
Elena Stepanova
0d73bc1c25 MDEV-7519 debian / ubuntu packaging creation of plugin table (if not exists) 
Previously IF NOT EXISTS was added in Debian version in revno 3543. 
Now added the same for Ubuntu.
 2015-02-08 15:47:00 +03:00
Sergei Golubchik
8e7649867f Merge 10.0-galera into 10.1 2015-02-06 16:14:23 +01:00
Nirbhay Choubey
f6e1906ced MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' is 
not in the dependency list

Added tar to the dependency list.
 2015-01-18 18:16:36 -05:00
Sergey Vojtovich
8c616cd347 MDEV-7053 - WSREP_STATUS & WSREP_MEMBERSHIP I_S tables 
wsrep_status was renamed to wsrep_info. Adjusted deb build scripts accordingly.
 2014-12-26 19:44:38 +04:00
Nirbhay Choubey
41367e4023 MDEV-7204: mariadb-galera-server el7 rpms packaging 
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
           when installing MariaDB-galera-server on
           RedhatEL/OracleEL/(Others?) RPM based 

* Added mariadb-server to "provides" for MariaDB Galera
  server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
  dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
 2014-12-09 10:35:16 -05:00
Nirbhay Choubey
86d7512f42 MDEV-7204: mariadb-galera-server el7 rpms packaging 
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
           when installing MariaDB-galera-server on
           RedhatEL/OracleEL/(Others?) RPM based 

* Added mariadb-server to "provides" for MariaDB Galera
  server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
  dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
 2014-12-09 10:27:49 -05:00
Nirbhay Choubey
3bb02f3e6d bzr merge -rtag:mariadb-10.0.15 maria/10.0 2014-12-05 12:33:02 -05:00
Sergei Golubchik
717a264ef4 MDEV-6894 Enable SEQUENCE engine by default 2014-12-04 10:41:52 +01:00
Sergei Golubchik
1caee39307 disable mroonga temporarily: see MDEV-7246 2014-12-02 22:25:53 +01:00
Sergei Golubchik
853077ad7e Merge branch '10.0' into bb-10.1-merge 
Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh
 2014-12-02 22:25:16 +01:00
Nirbhay Choubey
deffb95bc2 MDEV-7161: Build failure in buildbot on work-amd64-valgrind 
Fix for embedded build failure.
Also added wsrep_info plugin library to server debian package.
 2014-11-23 09:55:57 -05:00
Sergei Golubchik
17956118ca debian packaging: add mroonga and example engines 2014-11-18 22:27:26 +01:00
Nirbhay Choubey
5ff6f6f883 Added SST scripts to the server package. 2014-10-27 21:19:12 -04: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
d103e359f8 followup changes to timeout commit 
* fix debian patch
* update the copyright
* rename include guards to follow conventions
* restore incorectly deleted test file, add clarification in a comment
* capitalize the first letter of the status variable
 2014-10-10 22:27:36 +02:00
Nirbhay Choubey
068fb8569f bzr merge -rtag:mariadb-5.5.40 maria/5.5 2014-10-09 17:25:08 -04: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
c1a4f0c5ab include mariadb.pc in debian builds 2014-10-08 00:45:56 +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
9d4b365d5d MDEV-6550 Missing dependency on Debian 7 (Wheezy) installation package 
add bsdutils dependency, because mariadb-server-5.5 deb package uses logger
 2014-10-02 13:47:52 +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
d6a67ce080 Fix for syntax error in debian control file. 2014-09-25 13:32:55 -04:00
Nirbhay Choubey
a28c9a5857 MDEV-6790: 10.1: debian build failure 
Updated 33_scripts__mysql_create_system_tables__no_test.dpatch
to reflect user.default_role.
 2014-09-25 11:46:52 -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
Sergei Golubchik
989dd4d9ec 5.5 merge 2014-09-18 21:54:45 +02:00
Sergei Golubchik
e41bca0066 support statically linked jemalloc. use that for release builds 2014-09-18 17:00:44 +02:00
Sergei Golubchik
7e29c1b539 5.5 merge 2014-09-16 14:03:17 +02:00
Sergei Golubchik
f18b1400d1 debian: require jemalloc >= 3.0.0, because 2.2.5 (on precise) crashes 2014-09-15 18:55:17 +02:00
Sergei Golubchik
3d94523638 MDEV-6613 build system endianness test fails for ppc64le (i.e. Ubuntu) 
* remove bundled jemalloc, use the system one
* force jemalloc in release builds on linux
 2014-09-12 08:41:16 +02: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
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
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