Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-08-25 | 1 | -1/+5 |
|\ | |||||
| * | Merge 10.2 into 10.3 | Marko Mäkelä | 2021-08-25 | 1 | -1/+5 |
| |\ | |||||
| | * | MDEV-26109: s390x detected as 32bit in mtr tests | Daniel Black | 2021-08-25 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently @@version_compile_machine is used by mtr to determine if the compiled executable is 32 or 64 bits. We extend that logic by ensuring that if the DEFAUT_MACHINE name doesn't have "64" in its string, "-64bits" is appended to ensure these test pass. | ||||
* | | | MDEV-25870 Windows - fix ARM64 cross-compilation | Vladislav Vaintroub | 2021-06-07 | 1 | -1/+4 |
|/ / | |||||
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | * Update wrong zip-code | ||||
* | | | less re-cmake messages | Sergei Golubchik | 2018-08-12 | 1 | -1/+1 |
|/ / | |||||
* | | Adopt Debian's fix-FTBFS-on-GNU-Hurd.patch. | Sergei Petrunia | 2018-06-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | - 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-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -0/+4 |
|\ \ | |||||
| * \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -0/+4 |
| |\ \ | |||||
| | * | | Upstream MIPS 32bit-build-on-64bit patch from Debian Bug#838914 | Kristian Nielsen | 2016-10-21 | 1 | -0/+4 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838914 Fixes CMake so that when building a 32-bit mips binary on a 64-bit mips machine, the target is not set as 32-bit, which apparently confused some tests in mroonga. | ||||
| * | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -11/+14 |
| |\ \ | | |/ | |||||
| * | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) | Sergei Golubchik | 2014-10-11 | 1 | -6/+1 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore | ||||
* | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -11/+14 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Bug#11765489 CMAKE BUILD ON MAC OS X DOES NOT DETERMINE CPU TYPE | Tor Didriksen | 2013-03-01 | 1 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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" | ||||
* | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+1 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 1 | -1/+1 |
| | | |||||
* | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Use MESSAGE(STATUS ...) as we don't want any popup from the build system. | Tor Didriksen | 2012-10-23 | 1 | -1/+1 |
| | | |||||
* | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -2/+9 |
|\ \ | |/ | |||||
| * | Merged some fixes from 7.2 release branches | Bjorn Munch | 2012-03-22 | 1 | -2/+9 |
| | | |||||
* | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | | |||||
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+8 |
|/ | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup | ||||
* | Remove leftovers from old versions of the code. | Davi Arnaut | 2010-07-13 | 1 | -2/+1 |
| | |||||
* | Add components to INSTALL, some eraly Wix support | Vladislav Vaintroub | 2010-02-10 | 1 | -1/+4 |
| | |||||
* | fix OSX package names is OSX_DEPLOYMENT_TARGET is specified | Vladislav Vaintroub | 2010-02-05 | 1 | -5/+6 |
| | |||||
* | prettification of package names and fix compile bug on OSX/ppc | Vladislav Vaintroub | 2010-01-28 | 1 | -0/+124 |