mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
89773 commits 2786 branches 343 tags 1.7 GiB
Commit graph

136 commits

Author SHA1 Message Date
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
Sergei Golubchik
3620910eea cleanup: galera merge, simple changes 2014-10-01 23:38:27 +02: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
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
abbdc7ae86 MDEV-6118: Unable to install "MariaDB-connect-engine" when 
using "MariaDB-Galera-server"

rpm: Updated components' requires-list to include "MariaDB"
     instead of "MariaDB-server".

deb: Added (ORed) 'mariadb-galera-server-10.0' to the 'Depends'
     list of connect and oqgraph engine packages.
 2014-08-06 19:31:13 -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
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
Sergei Golubchik
de8cb7a1f3 MDEV-5485 Minor man pages formatting issues 
MDEV-6281 Typo in mysql_install_db scripts
and collateral changes:

* remove mysql_tableinfo.1 and references to it (there's no mysql_tableinfo)
* for debian: create manpages for mysqlrepair, mysqlanalyze, mysqloptimize
  (as symlinks for mysqlcheck.1, just as executables are symlinks to mysqlcheck)
* remove mysqlmanager.8 and references to it
* correct "very long line" error in mysqladmin.1
* simplify and fix table formatting in mysqlbinlog.1 and mysqldump.1
* fix a typo in the help text in mysql_install_db
* aria_chk: say "for Linux on x86_64", like other tools do
  (not "for Linux at x86_64")
* add simple manpages for aria_* utilities
 2014-05-30 23:19:26 +02:00
Sergei Golubchik
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergei Golubchik
a5beb350ae MDEV-5454 Dependencies for mariadb-connect-engine-10.0.deb don't look correct 2014-05-04 17:37:54 +02:00
Michael Widenius
e63c03db8d Merge with 10.0-base 
Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0
 2014-03-13 16:43:11 +02:00
Michael Widenius
1727849659 Merge with 5.5 2014-03-11 17:49:09 +02:00
Sergei Golubchik
5b7cab8219 default xtradb - fixes for debian packaging 2014-03-08 12:33:51 +01:00
Sergei Golubchik
2eaaeaeaa2 MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on libterm-readkey-perl 2014-04-10 13:10:33 +02:00
Sergei Golubchik
e82a82eef8 MDEV-6022 Patch 44_scripts__mysql_config__libs.dpatch is inapplicable, deb package creation fails 2014-04-07 20:52:04 +02:00
Alexey Botchkov
7449c7d32b MDEV-5756 Add Audit Plugin to Debian packaging. 2014-02-28 00:41:08 +04:00
Sergei Golubchik
05aba79e98 MDEV-4447 MariaDB sources should have unix-style line endings everywhere 2014-02-27 12:00:16 +01:00
Sergei Golubchik
a0de0fd50e revert bugfix for MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work 
it didn't help, instead it only broke upgrades even more
 2014-02-05 18:18:51 +01:00
Elena Stepanova
9e85bb709d MDEV-5591 Cannot build the package under Debian Wheezy 
Rules performed unnecessary copying which made tests run with wrong
global testdir
 2014-02-05 03:17:39 +04:00
Sergei Golubchik
72c20282db 10.0-base merge 2014-02-03 15:22:39 +01:00
Sergei Golubchik
65121806da upgrade sphinx to 2.1.5 2014-02-01 14:08:34 +01:00
Sergei Golubchik
59d9d08e2b 5.5 merge 2014-02-01 00:54:03 +01:00
Sergei Golubchik
a9c22c1888 MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work 
Use Breaks: not Conflicts:
 2014-01-29 16:10:53 +01:00
Sergei Golubchik
74d29b0ed3 MDEV-5493 ha_sphinx.so is not included into Ubuntu deb packages (included into Debian) 2014-01-28 19:44:19 +01:00
Sergei Golubchik
4a3ea30221 MDEV-4787 Missing dependency to "patch" for the Debian/Ubuntu "mariadb-test" package 
add patch as a "suggested" dependency to mariadb-test-5.5
 2014-01-27 16:58:26 +01:00
Sergei Golubchik
b85ab1d464 update debian patches to match the current code state 2014-01-23 00:02:22 +01:00
Sergei Golubchik
5660d6a550 put ha_xtradb.so in deb packages 2013-12-22 17:09:10 +01:00
Sergey Vojtovich
4cee899fb7 MDEV-5319 - Request for merge of Oqgraph v3 functionality 
storage/oqgraph into 10.0

- since oqgraph depends on Judy, move it to a separate package (DEB)
 2013-12-16 16:03:34 +04:00
Sergey Vojtovich
258bf32d3c MDEV-4748 - metadata_lock_info plugin 
- include metadata_lock_info plugin into debian packages
- ignore metadata_lock_info plugin in mysqld--help test
- let test suite run with built-in metadata_lock_info plugin
 2013-12-13 12:42:45 +04:00
Sergei Golubchik
b2c56742b5 restore debian/dist/Ubuntu/control that was changed by mistake 2013-12-12 17:02:13 +01:00
Sergei Golubchik
cec76b3861 correct old assert in add_role_user_mapping_action to match changed function prototypes. 
fix the element deleting logic for roles_mappings_hash
 2013-12-09 12:39:31 +01:00
Sergei Golubchik
ed910b62e9 remove unused libevent (that was merged from 5.6 by mistake) 2013-11-21 15:05:25 +01:00
Sergei Golubchik
26f56089c7 add missing plugins to deb packages 2013-11-14 19:56:55 +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
3d57c343e5 MDEV-5038 put tokudb into the server package 2013-11-11 09:30:35 +01:00
Sergei Golubchik
ab2bf1ad0b merge with 10.0.5 2013-11-09 11:05:51 +01:00
Sergei Golubchik
af22c45ec7 mariadb-tokudb-engine-10.0.deb 2013-11-09 11:04:54 +01:00