summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Power8: use C implementation of crc32 instead of ASMDaniel Black2018-05-071-1/+1
| | | | | | | | | | | | Compiles to same vector code, just a bit simplier. vec_crc32.c is now identical to upstream (https://github.com/antonblanchard/crc32-vpmsum/). C code by Rogerio Alves <rogealve@br.ibm.com> This implemention has been tested on big endian too. Signed-off-by: Daniel Black <daniel@linux.ibm.com>
* MDEV-12924 No --innodb-numa-interleave in mysqld binariesSachin Setiya2018-04-191-9/+18
| | | | | | | | | | It changes the cmake WITH_NUMA option to have 3 values Auto:- If libnuma present compile with numa (Default value) OFF:- Compile without libnuma On:- Compile with numa , throw error if libnuma not present Patch Contributer:- Vesa Patch Reviewer:- serg
* Misc. typosluz.paz2018-04-053-3/+3
| | | | Found via `codespell -i 3 -w --skip="./debian/po" -I ../mariadb-server-word-whitelist.txt ./cmake/ ./debian/ ./Docs/ ./include/ ./man/ ./plugin/ ./strings/`
* Merge 10.2 into 10.3Marko Mäkelä2018-03-301-1/+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.2' into 10.3Sergei Golubchik2018-03-281-1/+1
|\ \ | |/
| * 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
* | | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-202-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -DWITH_ASAN can be used as well now, on x64 Fix many clang-cl warnings.
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-192-5/+17
|\ \ \ \ \
| * \ \ \ \ Merge 10.2 into bb-10.2-extMarko Mäkelä2018-02-192-5/+17
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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 bb-10.2-ext into 10.3Marko Mäkelä2018-02-153-50/+30
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-083-50/+30
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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.
* | | | | | | | MDEV-13946 Server RPMs have dependency on "which"Sergei Golubchik2018-02-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup. use "command -v" instead of "which" simplify some checks.
* | | | | | | | Windows, compiling : use /permissive- switch to improve conformanceVladislav Vaintroub2018-02-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix a couple "initialization skipped by goto" and other new errors.
* | | | | | | | Windows, compile : reenable previously disabled warning C4291Vladislav Vaintroub2018-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no matching operator delete found; memory will not be freed if initialization throws an exception Added a no-op delete() for MEM_ROOT based placement-new()
* | | | | | | | Windows, compiling : reenable warning C4996 (deprecated functions)Vladislav Vaintroub2018-02-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But set _CRT_NONSTDC_NO_WARNINGS to silence silly warnings about ANSI C function being non-standard Remove now deprecated GetVersion()/GetVersionEx(),except single case where where it is really needed, in feedback plugin. Remove checks for Windows NT. Avoid old IPv4-only inet_aton, which generated the warning.
* | | | | | | | Windows : reenable warning C4805 (unsafe mix of types in bool operations)Vladislav Vaintroub2018-02-071-2/+2
| | | | | | | |
* | | | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ↵Vladislav Vaintroub2018-02-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'size_t' to 'type', possible loss of data) Handle string length as size_t, consistently (almost always:)) Change function prototypes to accept size_t, where in the past ulong or uint were used. change local/member variables to size_t when appropriate. This fix excludes rocksdb, spider,spider, sphinx and connect for now.
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2018-01-292-7/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-272-7/+19
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sql/table.cc
| | * | | | | | 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
| | | | | | | |
* | | | | | | | Deb: switch from usr/include/mysql to usr/include/mariadbOtto Kekäläinen2018-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matching libmariadb-dev package contents in official Debian repositories, the MariaDB Connector/C files should go into a folder using the 'mariadb' name. For compatibility with sources that expect to find 'mysql' stuff, create a symlink from include/mysql to include/mariadb.
* | | | | | | | Minor spelling fixes in code comments, docs and outputOtto Kekäläinen2018-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does not touch any variable names or any other actual code, and thus should not in any way affect how the code works.
* | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-111-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-111-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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-14881 cmake should succeed after installing libaio.Vladislav Vaintroub2018-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case libaio is not found, and required, remove variables HAVE_LIBAIO_H and HAVE_LIBAIO from cache, so that cmake rerun after installation of libaio would succeed.
* | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-043-2/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-013-2/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/make_dist.cmake.in mysql-test/r/func_json.result mysql-test/r/ps.result mysql-test/t/func_json.test mysql-test/t/ps.test sql/item_cmpfunc.h
| | * | | | | | 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.
View Lorry Controller Status