Commit graph

375 commits

Author SHA1 Message Date
Sergey Vojtovich
e397934177 Do not require libssl1.0.0 (not available on all buildbot platforms). 2013-08-08 12:03:30 +04:00
Sergey Vojtovich
5f8effe1db MDEV-4786 - merge 10.0-monty - 10.0
Fixed debian/ubuntu build failure.

cmake/ssl.cmake:
  Do not prefer static SSL libraries for WITH_SSL=system|yes as there is
  no guarantee that they will link well with MariaDB shared objects.
  Specifically on debian/ubuntu static SSL libraries are built without
  -fPIC.
  
  Restore 5.6 behavior. 10.0.3 never prefer static SSL libraries.
2013-07-27 17:04:57 +04:00
Sergei Golubchik
b7b5f6f1ab 10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
2013-07-21 16:39:19 +02:00
Sergei Golubchik
5f6380adde 10.0-base merge 2013-07-18 16:46:57 +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
Vladislav Vaintroub
00653d7f57 Windows, compilation : restore support for erxceptions (fixes warnings in Innodb code) 2013-07-15 13:42:50 +02:00
Sergei Golubchik
c3e3c78048 cmake: don't check for the compiler on every invocation of RESTRICT_SYMBOL_EXPORTS(),
do it only once
2013-07-09 22:30:04 +02:00
Vladislav Vaintroub
bdb05fcf7c Set valid default ("yes") for WITH_SSL cmake variable on Unixes. 2013-07-05 14:40:01 +02:00
Sergei Golubchik
935817e985 Fix to compile without partitioning.
Remove few ifdef's
2013-06-15 19:09:40 +02:00
Vladislav Vaintroub
4b058643cd MDEV-4601 : Allow MariaDB to be build without non-blocking client.
Non-blocking client currently can be build on Windows, GCC on i386 and x64, or any OS wth ucontext.h header. Prior to this patch, build failed if neither of these conditions is true.
Fix to avoid compiler errors in these case - non-blocking API would not be useful on , but otherwise everything will work as before.
2013-06-15 14:22:03 +02:00
Michael Widenius
3bc814beda - Added -Wno-uninitialized to avoid warnings in release builds
(uninitalized variables are detected by DBUG builds)
- Fixed wrong declaration which cased compile failure on 32 bit

cmake/build_configurations/mysql_release.cmake:
  Added -Wno-uninitialized to avoid warnings in release builds
  (uninitalized variables are detected by DBUG builds)
include/maria.h:
  Fixed wrong declaration which cased compile failure on 32 bit
include/myisam.h:
  Fixed wrong declaration which cased compile failure on 32 bit
2013-06-09 13:26:10 +03:00
Sergei Golubchik
72ba95873a 10.0-base merge
(without InnoDB - all InnoDB changes were ignored)
2013-06-06 21:32:29 +02:00
Sergei Golubchik
4749d40c63 5.5 merge 2013-06-06 17:51:28 +02:00
Vladislav Vaintroub
689c1b44a9 MDEV-4607 : libreadline-related compilation problems on NetBSD.
Problem : 
libreadline.so was already present on the machine, however the cmake check NEW_READLINE_INTERFACE was unsuccessfull indicating, thus bundled library had to be used instead of  system library.
The problem was that the value for HAVE_HIST_ENTRY cmake variable  was cached with incorrect  value (1 on NetBSD).

The fix is to change HAVE_HIST_ENTRY to 0 with  CACHE FORCE, after switching to bundled readline.
2013-06-01 21:30:33 +02:00
Sergei Golubchik
1db0c42e53 followup for revision 3751 "centos5 gcc 4.1 asm bug"
remove the workaround from cmake/os/FreeBSD.cmake
2013-05-28 21:25:59 +02:00
Sergei Golubchik
7642154725 MDEV-4199 Installing postfix on CentOS 5.9 requires MariaDB-server
to match distribution packages better:
  remove "mysql" from server.rpm Provides, add it to the shared.rpm Provides.
  fake provides that "mysql" and "mysql-libs" packages would've had.

cleanup:
  remove auto-generated provides from the manual provides list.
2013-05-13 15:49:27 +02:00
Sergei Golubchik
009dee833c centos5 gcc 4.1 asm bug
include/atomic/x86-gcc.h:
  force %esi register, don't give gcc a choice.
  (otherwise it could choose %ebx, and 4.1 did)
2013-05-07 18:28:36 +02:00
Sergei Golubchik
b381cf843c mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
Alexander Barkov
5fb0d16016 Fixing build-bot compilation failure on SolarisX86,
who has two different incompatible copies of zlib installed:
(in /usr and in /usr/local).
cmake errorneously chose *.h file from /usr/local/include,
while zlib.a/zlib.so from /usr/lib/. Compilation failed
because of a missing symbol gzopen64.

modified:
  @ cmake/zlib.cmake
  Removing the line (as suggested by Vlad) which made cmake choose
  the wrong library.
  Note: this line used to be a hack for old HP machines,
  it's not needed anymore.
2013-04-21 23:19:20 +04:00
Sergei Golubchik
88b89aaa82 fixes for buildbot.
increase the version.
2013-04-21 09:38:54 -07:00
Alexander Barkov
63fb05225f Merging from maria-10.0-connect (DEB packaging related fixes)
added:
  debian/mariadb-connect-engine-10.0.files
modified:
  cmake/build_configurations/mysql_release.cmake
  debian/dist/Debian/control
  debian/dist/Debian/mariadb-server-10.0.files
  debian/dist/Ubuntu/control
  debian/dist/Ubuntu/mariadb-server-10.0.files
pending merges:
  Alexander Barkov 2013-04-20 Adding mariadb-connect-engine-10.0 deb packa...
    Alexander Barkov 2013-04-19 Removing the connect engine from mariadb...
2013-04-20 20:51:26 +04:00
Alexander Barkov
e5da28770d Removing the connect engine from mariadb-server package,
as it needs unixODBC and libxml2 as dependencies

modified:
  cmake/build_configurations/mysql_release.cmake
  debian/dist/Debian/mariadb-server-10.0.files
  debian/dist/Ubuntu/mariadb-server-10.0.files
2013-04-19 22:48:18 +04:00
Sergei Golubchik
a9035be5b7 10.0-base merge 2013-04-15 15:09:22 +02:00
Sergei Golubchik
0d25ee4f13 MDEV-4254 Semisync plugins to link statically into MariaDB
fix semisync plugins and tests to work with both with static and dynamic linking
2013-04-09 23:28:21 +02:00
Alexander Barkov
d1e162e011 Merging utf16le from MySQL-5.6
added:
  mysql-test/include/ctype_heap.inc
  mysql-test/include/ctype_strtoll10.inc
  mysql-test/r/ctype_utf16le.result
  mysql-test/t/ctype_utf16le.test
modified:
  cmake/character_sets.cmake
  include/m_ctype.h
  mysql-test/r/ctype_ucs.result
  mysql-test/r/ctype_utf16.result
  mysql-test/r/ctype_utf32.result
  mysql-test/suite/funcs_1/r/innodb_func_view.result
  mysql-test/suite/funcs_1/r/memory_func_view.result
  mysql-test/suite/funcs_1/r/myisam_func_view.result
  mysql-test/suite/sys_vars/r/character_set_client_basic.result
  mysql-test/suite/sys_vars/r/character_set_connection_basic.result
  mysql-test/suite/sys_vars/r/character_set_database_basic.result
  mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
  mysql-test/suite/sys_vars/r/character_set_results_basic.result
  mysql-test/t/ctype_ucs.test
  mysql-test/t/ctype_utf16.test
  mysql-test/t/ctype_utf32.test
  mysys/charset-def.c
  sql/item_func.cc
  sql/sys_vars.cc
  strings/ctype-latin1.c
  strings/ctype-ucs2.c
2013-03-28 17:19:09 +04:00
Sergei Golubchik
993ea79f2d 5.5 merge 2013-03-27 23:41:02 +01:00
Vladislav Vaintroub
1827d9591e MDEV-4245 : Fix maintainer compilation flags.
-Wno-invalid-offsetoff  is a C++ warnng, not C.

Patch by Pavel Ivanov.
2013-03-26 11:33:49 +01:00
Michael Widenius
068c61978e Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
Sergei Golubchik
e4e5c9fd14 hack in dependencies to imitate mysql-*.rpm even better 2013-03-06 09:38:08 +01:00
Sergei Golubchik
3bfd88d1d6 MDEV-4068 rpm scriptlet chown command dangerous
add --mysqld option to my_print_defaults
change server-postin script to use that
2013-03-06 09:32:13 +01:00
unknown
9b993fda63 Fix wrong install location for DEB supportfiles. 2013-03-04 12:49:35 +01:00
Tor Didriksen
e478ceaa3f Bug#11765489 CMAKE BUILD ON MAC OS X DOES NOT DETERMINE CPU TYPE
Don't use CMAKE_OSX_ARCHITECTURES to determine DEFAULT_MACHINE
if it is not defined.

If we're 64bit, then use "x86_64" rather than "x86"
2013-03-01 13:25:59 +01:00
Murthy Narkedimilli
8f73221035 Updated/added copyright headers 2013-02-26 06:35:17 +01:00
Tor Didriksen
f325fc42e8 Bug#14300733 CMAKE DOES NOT CHECK FOR ZLIB VERSION
Add check for compressBound() and deflateBound()
Keep existing functionality: fallback to bundled zlib if functions not found.
2013-02-20 11:24:16 +01:00
Vladislav Vaintroub
2c37ace131 MDEV-4174 - Use kqueue for threadpool implementation on more BSD variants than just FreeBSD
or OSX - i.e NetBSD, OpenBSD, DragonFly, etc.
2013-02-19 23:46:52 +01:00
Sergei Golubchik
f93b5a6027 make rpm packages to respect CMAKE_INSTALL_PREFIX 2013-02-08 12:59:54 +01:00
Sergei Golubchik
ab83952f29 10.0-base merge 2013-01-31 09:48:19 +01:00
Sergei Golubchik
6f2680a73c move cassandra-related code from cmake/cpack_rpm.cmake
to storage/cassandra/CMakeLists.txt
2013-01-29 19:14:43 +01:00
Sergei Golubchik
0af4b6c6ee 5.5 merge 2013-01-29 15:10:47 +01:00
Sergei Golubchik
52fbe44fbb more changes for fedora18 2013-01-29 12:27:31 +01:00
Sergei Golubchik
78e47eb004 fix 'compat' rpm for fedora18 2013-01-29 10:46:05 +01:00
Vladislav Vaintroub
8864940583 MDEV-3971 : problems installing MariaDB packages (conflicts with mysql-libs-5.5)
FIx  : make "shared" RPM obsolete/provide mysql-libs
2013-01-25 16:50:14 +01:00
Jani Tolonen
09665bfd0e MDEV-3931 Cassandra SE packaging
Added autodetection for thrift library and includes
Added Cassandra Storage Engine rpm
2013-01-23 15:52:59 +01:00
Sergei Golubchik
48bf57b02e MDEV-3832 MariaDB conflicts with packages filesystem-3.1-2.fc18.i686 and jre-1.7.0_09-fcs.i586 on Fedora 18
fix the rpm packaging to work on Fedora18. Two problems:
* conflicts on common directories with other packages.
* more auto-generated requirements for mariadb-test.rpm
2013-01-19 14:03:33 +01:00
Vladislav Vaintroub
5649377b55 Fix Windows installers' bootstrapper scripts , after mysql_performance_tables.sql was split off mysql_system_tables.sql 2013-01-18 18:49:07 +01:00
Sergei Golubchik
d3935adf7a mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
Michael Widenius
edc89f7511 Buildbot fixes and cleanups:
- Added --verbose to BUILD scripts to get make to write out compile commands.
- Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 was used with build scripts.
- Don't write warnings about replication variables when doing bootstrap.
- Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors.
- Ignore some compiler warnings

BUILD/FINISH.sh:
  Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 or --verbose was used
BUILD/SETUP.sh:
  Added --verbose to print out the full compile lines
  Updated help message
client/mysqltest.cc:
  Fixed that one can use 'replace' with cat_file
cmake/configure.pl:
  If --verbose is used, get make to write out compile commands
debian/dist/Debian/rules:
  Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds
debian/dist/Ubuntu/rules:
  Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds
include/my_pthread.h:
  Made set_timespec_time_nsec() more portable.
include/mysql/psi/mysql_thread.h:
  Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors.
mysql-test/suite/innodb/r/auto_increment_dup.result:
  Fixed wrong DBUG_SYNC
mysql-test/suite/innodb/t/auto_increment_dup.test:
  Fixed wrong DBUG_SYNC
mysql-test/suite/perfschema/include/upgrade_check.inc:
  Make test more portable for changes in *.sql files
mysql-test/suite/perfschema/r/pfs_upgrade.result:
  Updated test results
mysql-test/valgrind.supp:
  Ignore running Aria checkpoint thread
scripts/mysqlaccess.sh:
  Changed reference of bugs database
  Ensure that also client-server group is read.
sql/handler.cc:
  Added missing syncpoint
sql/mysqld.cc:
  Don't write warnings about replication variables when doing bootstrap
sql/mysqld.h:
  Don't write warnings about replication variables when doing bootstrap
sql/rpl_rli.cc:
  Don't write warnings about replication variables when doing bootstrap
sql/sql_insert.cc:
  Don't mask SERVER_SHUTDOWN in insert_delayed
  This is done to be able to distingush between shutdown and interrupt errors
support-files/compiler_warnings.supp:
  Ignore some compiler warnings in xtradb,innobase, oqgraph, yassl, string3.h
2013-01-11 02:03:43 +02:00
unknown
0a5312dc2f Make cassandra not built by default 2013-01-10 01:01:15 +02:00
unknown
61412c0c31 pre-merge 2012-12-23 23:37:11 +02:00