mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
171315 commits 2790 branches 343 tags 1.7 GiB
Commit graph

546 commits

Author SHA1 Message Date
Nirbhay Choubey
91acc8b16f Merge tag 'mariadb-10.0.21' into 10.0-galera 2015-08-08 14:21:22 -04:00
Sergei Golubchik
a0107d9c1d MDEV-8296 MSVS 2013 & WiX 3.9 
removed unused directory
 2015-08-01 17:48:41 +02:00
Nirbhay Choubey
e11cad9e9d Merge tag 'mariadb-10.0.19' into 10.0-galera 2015-05-09 17:09:21 -04:00
Sergei Golubchik
1d3ea9ecd8 perfschema 5.6.24 
including the big commit
  commit 305130361bf72726de220f3d2b2787395e10be61
  Author: Marc Alff <marc.alff@oracle.com>
  Date:   Tue Feb 10 11:31:32 2015 +0100

      WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6

(with the following commits) and related changes in sql/
 2015-05-05 15:23:47 +02: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
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
5dce6aa1fe Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge 2015-02-12 13:14:55 +01:00
Sergei Golubchik
8e80f91fa3 Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 2015-02-11 23:50:40 +01:00
Sergei Golubchik
75884242ab restore a cross-compiling bit that was lost in a merge 2015-02-10 10:19:42 +01:00
Nirbhay Choubey
7cda4bee0e maria-10.0.16 merge 
bzr merge -r4588 maria/10.0
 2015-01-26 22:54:27 -05:00
Sergei Golubchik
d9c01e4b4a 5.5 merge 2015-01-21 12:03:02 +01:00
Sergei Golubchik
a978bdda1e mysql-5.5.41 merge 2014-12-19 11:35:44 +01:00
Tor Didriksen
8e94f12823 Bug#20136840 REMOVE REMAINING REFERENCES TO BZR IN CMAKE SCRIPTS 
Patch for 5.5
 2014-12-11 12:46:04 +01:00
Tor Didriksen
2ee7167bbd Bug#19908468 PLACE CORRECT INFORMATION IN INFO_SRC AFTER TRANSITIONING TO GIT 
Use 'git log -1; git branch' rather than 'bzr version-info'
 2014-11-11 16:01:13 +01:00
Tor Didriksen
9bd6e87545 Bug#19890133 MAKE DIST USING BZR EXPORT EVEN FOR SOURCE DIR NOT A BZR REPO 
For 'make dist': only use 'bzr export' if bzr root == ${CMAKE_SOURCE_DIR}
Same thing for git.
 2014-11-11 10:58:47 +01:00
Balasubramanian Kandasamy
56378ab9ce Added sles11 repo packages 2014-11-04 08:44:08 +01:00
Balasubramanian Kandasamy
0773c7f422 Added sles11 repo packages 2014-11-04 08:30:23 +01:00
Jon Olav Hauglid
57eec7bc29 Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG 
Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS
Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG
Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE
  
Backport from mysql-5.6 to mysql-5.5
 2014-10-13 09:52:28 +02:00
Jon Olav Hauglid
8b64f82505 Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG 
Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS
Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG
Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE
  
Backport from mysql-5.6 to mysql-5.5
 2014-10-13 09:52:28 +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
604b653394 MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config 
1. move cflags/libs cleanup from mysql_config.sh (runtime)
   to for_client.cmake (build time). Include/library paths are
   still calculated at runtime (they depend on the location of mysql_config)

2. Use cleaned-up cflags/libs to generate mariadb.pc

3. remove obsolete @expansions@ from mysql_config (for variables that are
   never set in cmake files)
 2014-10-02 16:58:26 +02:00
Nirbhay Choubey
9a57de86be bzr merge -r4123..4144 codership/5.6 2014-09-30 18:06:15 -04:00
Nirbhay Choubey
c916085e27 bzr merge -rtag:mariadb-10.0.14 maria/10.0/ 2014-09-28 20:43:56 -04:00
Sergei Golubchik
7e29c1b539 5.5 merge 2014-09-16 14:03:17 +02:00
Sergei Golubchik
32360bb728 MDEV-6526 INFO_SRC and INFO_BIN installed wrong 
don't install them at all
 2014-09-12 08:41:44 +02:00
Sergei Golubchik
4ff2a680ab MDEV-6565 search order for my.cnf inconsistent in docs/use, and global override with build-time -DDEFAULT_SYSCONFDIR is ignored 
don't let INSTALL_SYSCONFDIR overwrite DEFAULT_SYSCONFDIR
 2014-09-10 13:22:01 +02:00
James Le Cuirot
55b47649a1 MDEV-6579: Properly handle gen_pfs_lex_token when cross-compiling 2014-08-15 22:54:07 +01:00
Nirbhay Choubey
8358dd53b7 bzr merge -r4346 maria/10.0 (maria-10.0.13) 2014-08-11 23:55:41 -04:00
James Le Cuirot
fd4a4b8ff7 MDEV-6562: Fix WITHOUT_SERVER build 2014-08-11 22:43:29 +01:00
Sergei Golubchik
6fb17a0601 5.5.39 merge 2014-08-07 18:06:56 +02:00
Sergei Golubchik
3390291b95 typo fixed: only use -ggdb3 when it's supported by the compiler 2014-08-06 12:44:57 +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
7434de31ac typo in CMakeLists.txt that caused USE_MYSYS_NEW to be set too early and incorrectly 2014-07-08 19:37:37 +02:00
Sergei Golubchik
528c1111ad MDEV-6410 Cross-compile fixes 
https://code.launchpad.net/~chewi/maria/mysql-fix-bug61340/+merge/217351
 2014-07-08 19:34:53 +02:00
Jon Olav Hauglid
6cb3ca5996 Bug#19001781: ADD SUPPORT FOR CMAKE 3 
Set CMP0026 and CMP0045 policies when using CMake 
version 3 or higher to restore old CMake behavior.
 2014-06-24 09:13:01 +02:00
Jon Olav Hauglid
688416794a Bug#19001781: ADD SUPPORT FOR CMAKE 3 
Set CMP0026 and CMP0045 policies when using CMake 
version 3 or higher to restore old CMake behavior.
 2014-06-24 09:13:01 +02:00
Nirbhay Choubey
a76a6601ec bzr merge -rtag:mariadb-10.0.12 maria/10.0 2014-06-19 13:12:38 -04:00
Balasubramanian Kandasamy
2bb7885fbc Bug#18972488 Remove packaging/rpm-uln directory from source - Updated CMakeLists.txt 2014-06-17 09:59:46 +02:00
Balasubramanian Kandasamy
ba51779cf6 Bug#18972488 Remove packaging/rpm-uln directory from source - Updated CMakeLists.txt 2014-06-17 09:59:46 +02:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
77ec219d58 cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced; 
use -ggdb3 if supported
 2014-06-03 10:57:57 +02:00
Sergei Golubchik
44ce364ac2 MDEV-5645 MariaDB-5.5.35 - references are made to an "EXCEPTIONS-CLIENT" file but it does not exist 
Added the EXCEPTIONS-CLIENT (that was lost in the merge),
as the ascii version of http://www.mysql.com/about/legal/licensing/foss-exception/
 2014-05-31 13:18:56 +02:00
Nirbhay Choubey
086af8367e bzr merge -r4209 maria/10.0. 2014-05-21 11:09:55 -04:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergei Golubchik
5401d44708 fix broken -DWITHOUT_SERVER build: move sql-dependent unit test from mysys/ to sql/ 2014-05-05 12:51:21 +02:00
James Le Cuirot
cdc38712e4 MySQL Bug #61340: Use CMake EXPORT feature to aid cross-compiling. 
This technique is documented at:
http://www.cmake.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
  
Basic steps are:
# mkdir native cross
# cd native
# cmake /path/to/maria
# make IMPORT_EXECUTABLES
# cd ../cross
# cmake -DCMAKE_TOOLCHAIN_FILE=foo -DIMPORT_EXECUTABLES=/path/to/native/import_executables.cmake /path/to/maria
# make
 2014-04-27 00:02:19 +01:00
Nirbhay Choubey
90e4f7f9d3 * bzr merge -rtag:mariadb-10.0.9 maria/10.0 
* Fix for post-merge build failures.
 2014-03-26 14:27:24 -04:00
Tor Didriksen
2d5be2fc20 Backport of: 
Bug#17894997 CMAKE WARNING WRT INTERFACE_LINK_LIBRARIES
  Bug#17905155 CMAKE WARNING WHEN GENERATING MAKEFILE
  Bug#71089 CMake warning when generating Makefile

Use old policy for LINK_INTERFACE_LIBRARIES.
 2014-03-05 13:01:54 +01:00
Tor Didriksen
1a8ae4d705 Backport of: 
Bug#17894997 CMAKE WARNING WRT INTERFACE_LINK_LIBRARIES
  Bug#17905155 CMAKE WARNING WHEN GENERATING MAKEFILE
  Bug#71089 CMake warning when generating Makefile

Use old policy for LINK_INTERFACE_LIBRARIES.
 2014-03-05 13:01:54 +01:00
Sergei Golubchik
016bd4fc5f MDEV-5620 CMake option to compile against an external PCRE library 2014-03-04 01:22:53 +01:00