summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-08-024-0/+19
|\
| * Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-252-0/+12
| |\
| | * MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helperSergei Golubchik2018-07-192-0/+11
| | | | | | | | | | | | | | | | | | | | | Don't install server files if WITHOUT_SERVER is specified. "Server files" are defined as files going into the MariaDB-Server RPM, that is files in the components Server, ManPagesServer, Server_Scripts, IniFiles, SuportFiles, and Readme.
| * | Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanjaOleksandr Byelkin2018-07-191-1/+1
| |\ \ | | |/
| | * MDEV-16596 : Windows - redo log does not work on native 4K sector disks.Vladislav Vaintroub2018-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disks with native 4K sectors need 4K alignment and size for unbuffered IO (i.e for files opened with FILE_FLAG_NO_BUFFERING) Innodb opens redo log with FILE_FLAG_NO_BUFFERING, however it always does 512byte IOs. Thus, the IO on 4K native sectors will fail, rendering Innodb non-functional. The fix is to check whether OS_FILE_LOG_BLOCK_SIZE is multiple of logical sector size, and if it is not, reopen the redo log without FILE_FLAG_NO_BUFFERING flag.
| * | Adopt Debian's fix-FTBFS-on-GNU-Hurd.patch.Sergei Petrunia2018-06-292-0/+7
| | | | | | | | | | | | | | | | | | | | | - Took the original patch by Ondrej Sury; - Applied a fix for a known problem in the patch: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882062 - Fixed a few other issues
| * | Merge branch '10.0' into 10.1Sergei Golubchik2018-06-211-1/+1
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2018-06-211-1/+1
| | |\
| | | * Revert "MDEV-16075: Workaround to run MTR test suite for make test"Sergei Golubchik2018-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d39629f01ebdd5b89186e6c8a4a8d3dd528bd26a. Because running mtr for many hours with no output whatsoever is not really what we should do. And in 5.5 `make test` just works anyway, nothing to fix here.
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-101-1/+1
| | |\ \ | | | |/
| | | * MDEV-16075: Workaround to run MTR test suite for make testTeodor Mircea Ionita2018-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assign all tests added via MY_ADD_TEST to a bogus default_ignore target, so that they are not ran by default when doing bare make test. Add default test named MTR that calls mysql-test-run suite, which is now the single test run by make test. In consequence, modified unit/suite.pm to exclude the MTR test and run the real ctests flagged for default_ignore target, thus no circular loop.
* | | | MDEV-16596 : Windows - redo log does not work on native 4K sector disks.Vladislav Vaintroub2018-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disks with native 4K sectors need 4K alignment and size for unbuffered IO (i.e for files opened with FILE_FLAG_NO_BUFFERING) Innodb opens redo log with FILE_FLAG_NO_BUFFERING, however it always does 512byte IOs. Thus, the IO on 4K native sectors will fail, rendering Innodb non-functional. The fix is to check whether OS_FILE_LOG_BLOCK_SIZE is multiple of logical sector size, and if it is not, reopen the redo log without FILE_FLAG_NO_BUFFERING flag.
* | | | fix debian packaging for tokudbSergei Golubchik2018-06-241-0/+1
| | | |
* | | | MDEV-13785: move defination HAVE_LARGE_PAGES -> HAVE_LINUX_LARGE_PAGESDaniel Black2018-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAVE_LARGE_PAGES was always Linux but now there is HAVE_SOLARIS_LARGE_PAGES in the code base. Innodb was using HAVE_LINUX_LARGE_PAGES so keep this consistent everywhere. Test plan: $ grep Hugepagesize: /proc/meminfo Hugepagesize: 2048 kB $ sudo sysctl vm.nr_hugepages=1024 vm.nr_hugepages = 1024 $ sudo sysctl kernel.shmmax=$(( 2 * 1024 *1024 * 1024 )) kernel.shmmax = 2147483648 No errors in ouput: $ sql/mysqld --skip-networking --datadir=/tmp/datadir --log-bin=/tmp/datadir/mysqlbin --socket /tmp/s.sock --lc-messages-dir=${PWD}/sql/share --verbose --large-pages=1 2018-03-23 12:51:18 139697428129984 [Note] sql/mysqld (mysqld 10.2.14-MariaDB-log) starting as process 25406 ... 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Mutexes and rw_locks use GCC atomic builtins 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Uses event mutexes 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Compressed tables use zlib 1.2.11 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Using Linux native AIO 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Number of pools: 1 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Using SSE2 crc32 instructions 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Initializing buffer pool, total size = 128M, instances = 1, chunk size = 128M 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Completed initialization of buffer pool 2018-03-23 12:51:18 139696883590912 [Note] InnoDB: If the mysqld execution user is authorized, page cleaner thread priority can be changed. See the man page of setpriority(). 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Highest supported file format is Barracuda. 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: 128 out of 128 rollback segments are active. 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Removed temporary tablespace data file: "ibtmp1" 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Creating shared tablespace for temporary tables 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: Setting file './ibtmp1' size to 12 MB. Physically writing the file full; Please wait ... 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: File './ibtmp1' size is now 12 MB. 2018-03-23 12:51:18 139697428129984 [Note] InnoDB: 5.7.21 started; log sequence number 1620099 2018-03-23 12:51:18 139696713733888 [Note] InnoDB: Loading buffer pool(s) from /tmp/datadir/ib_buffer_pool 2018-03-23 12:51:18 139696713733888 [Note] InnoDB: Buffer pool(s) load completed at 180323 12:51:18 2018-03-23 12:51:18 139697428129984 [Note] Plugin 'FEEDBACK' is disabled. 2018-03-23 12:51:18 139697428129984 [Note] Reading of all Master_info entries succeded 2018-03-23 12:51:18 139697428129984 [Note] Added new Master_info '' to hash table 2018-03-23 12:51:18 139697428129984 [Note] sql/mysqld: ready for connections. Version: '10.2.14-MariaDB-log' socket: '/tmp/s.sock' port: 0 Source distribution $ grep -i huge /proc/25406/smaps | grep -v ' 0 kB' Private_Hugetlb: 8192 kB Private_Hugetlb: 2048 kB $ grep huge /proc/25406/numa_maps 7f0d74400000 default file=/SYSV00000000\040(deleted) huge 7f0dbd200000 default file=/SYSV00000000\040(deleted) huge dirty=4 N0=4 kernelpagesize_kB=2048 7f0dc5600000 default file=/SYSV00000000\040(deleted) huge 7f0dd1200000 default file=/SYSV00000000\040(deleted) huge dirty=1 N0=1 kernelpagesize_kB=2048 $ grep Huge /proc/meminfo AnonHugePages: 0 kB ShmemHugePages: 0 kB HugePages_Total: 940 HugePages_Free: 935 HugePages_Rsvd: 177 HugePages_Surp: 0 Hugepagesize: 2048 kB Ran again with --memlock (note needs ulimit -l > size) $ grep Huge /proc/meminfo AnonHugePages: 0 kB ShmemHugePages: 0 kB HugePages_Total: 940 HugePages_Free: 758 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 2048 kB $ grep huge /proc/26020/numa_maps 7fe870400000 default file=/SYSV00000000\040(deleted) huge dirty=62 N0=62 kernelpagesize_kB=2048 7fe8b3a00000 default file=/SYSV00000000\040(deleted) huge dirty=66 N0=66 kernelpagesize_kB=2048 7fe8bd600000 default file=/SYSV00000000\040(deleted) huge dirty=53 N0=53 kernelpagesize_kB=2048 7fe8c8400000 default file=/SYSV00000000\040(deleted) huge dirty=1 N0=1 kernelpagesize_kB=2048 $ grep -i huge /proc/26020/smaps | grep -v ' 0 kB' Private_Hugetlb: 126976 kB Private_Hugetlb: 135168 kB Private_Hugetlb: 108544 kB Private_Hugetlb: 2048 kB
* | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2018-03-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-03-191-1/+1
| |\ \ \
| | * | | Bump wsrep patch version to 25.23Teemu Ollakka2018-02-251-1/+1
| | | | |
| | * | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/innobase/lock/lock0lock.cc storage/xtradb/lock/lock0lock.cc storage/xtradb/lock/lock0wait.cc support-files/mysql.server.sh
* | | | | Disable noisy warning in old compiler (VS2015)Vladislav Vaintroub2018-02-141-1/+5
| | | | |
* | | | | Add some hints for finding bison on its usual locations on Windows.Vladislav Vaintroub2018-02-141-1/+10
| | | | |
* | | | | Windows, compiling - disable pkg_configVladislav Vaintroub2018-02-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkg_config usually comes with Strawberry perl, and tends to find packages that might work in mingw compilation, but not with MSVC. Thus disable PKG_CONFIG, otherwise any FIND_PACKAGE() that is using PkgConfig can find something (like LibXml2 from connect), can potentially find something that is not going to compile.
* | | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-063-50/+29
|\ \ \ \ \ | |/ / / /
| * | | | correctly detect unsupported compiler flagsSergei Golubchik2018-02-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in gcc `-Wno-unsupported-something` will not be an error or even a warning, so cmake will think the flag is supported. But if there's any other warning during compilation, for any reason, unknown option will be a warning too. Or an error when -Werror, even if that "other warning" would not be an error on itself. So we need to detect whether `-Wno-unsupported-something` is *really* supported. Luckily, `-Wunsupported-something` will always fail with an error. So, whenever there's a need to detect if -Wno-something is supported, test -Wsomething instead.
| * | | | cleanup: simplify maintainer.cmakeSergei Golubchik2018-02-061-45/+21
| | | | |
| * | | | silence the annoying compiler warningSergei Golubchik2018-02-051-0/+2
| | | | |
| * | | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-0/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-01-181-0/+1
| | | |\ \
| | | | * | dos2unix cmake/mysql_add_executable.cmakeTor Didriksen2017-11-091-48/+48
| | | | | |
| | | | * | Bug#26022865 BUILD FOR WINDOWS-S12-64BIT,ADVANCED IS FAILING ON PB2 MYSQL-5.6Tor Didriksen2017-11-092-66/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cmake code for signing executables. Automatic signing has always failed anyways. It should be done manually as part of the release process.
* | | | | | Fix MinSizeRel build on Windows.Vladislav Vaintroub2018-01-262-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | do not include test suite in release zip anymore.
* | | | | | Windows : fix compile warnings C4267, on 32bit firstVladislav Vaintroub2018-01-261-2/+5
| | | | | |
* | | | | | Fix and reenable Windows compiler warning C4800 (size_t conversion).Vladislav Vaintroub2018-01-261-2/+2
| | | | | |
* | | | | | Windows, compilation : Treat warning as error, if MYSQL_MAINTAINER_MODEVladislav Vaintroub2018-01-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is set to ERR This matches gcc/clang handling.
* | | | | | MDEV-12458: Variable and log records to indicate RocksDB version are missingVarun Gupta2017-12-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Added a system variabe rocsdb_git_hash to MyRocks which tell us the version of RocksDB being used
* | | | | | MDEV-9869 INSTALL SONAME 'ha_connect'Sergei Golubchik2017-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix 011497bd603 in RPM and DEB: storage engine packages must require the server package of exactly correct version.
* | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-221-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Generate and install sysusers and tmpfiles configurationChristian Hesse2017-12-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using systemd we can automate creating users and directories. So generate and install the configuration files. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org> Small change in cmake/install_layout.cmake compared to original contributor patch to also install SYSTEMD_SYSUSERS and SYSTEMD_TMPFILES directories. The variables were being set, but the loop which defines the final install files was not updated.
* | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-11-241-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix typo, and disable own dtrace proibes on Solaris, really.Vladislav Vaintroub2017-11-211-1/+1
| | | | | |
| * | | | | Fix compile error.wlad2017-11-211-1/+1
| | | | | |
| * | | | | MDEV-14283 : Fix Solaris 10 build.wlad2017-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce system check for posix_memalign (not available on Solaris 10) - Disable dtrace probes, to fix weird link errors in mariabackup
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-11-211-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2017-11-101-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | MW-406 Bumped up the wsrep patch version (5.6.37-25.21)Teemu Ollakka2017-11-081-1/+1
| | | | | |
| | * | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-036-52/+72
| | |\ \ \ \ | | | |/ / /
* | | | | | MDEV-13836 mariadb_config & mysql_config output differSergei Golubchik2017-10-261-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | compile C/C with system zlib, when the server uses system zlib
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-243-5/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Various compier warningsSergei Golubchik2017-10-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | gcc 5.4 and 7.1, Debug and Release builds
View Lorry Controller Status