Sergei Golubchik
a98c85bb50
Merge branch '10.0-galera' into 10.1
2016-11-02 13:44:07 +01:00
Nirbhay Choubey
5db2195a35
Merge tag 'mariadb-10.0.28' into 10.0-galera
2016-10-28 15:50:13 -04:00
Kristian Nielsen
39b7affcb1
Upstream MIPS 32bit-build-on-64bit patch from Debian Bug#838914
...
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.
2016-10-21 23:02:56 +02:00
Sergei Golubchik
7f5e51b940
MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)
...
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
2014-10-11 18:53:06 +02:00
Jan Lindström
ba3ff50ab2
Merge 10.0 to galera-10.0
2013-09-03 17:50:36 +03:00
Sergei Golubchik
005c7e5421
mysql-5.5.32 merge
2013-07-16 19:09:54 +02:00
Seppo Jaakola
db0cfba638
Merged with lp:maria revision #3766
2013-07-13 13:30:03 +03:00
Seppo Jaakola
0a9216835f
Initial merge result with mariaDB 10: lp:maria
2013-07-13 13:01:13 +03:00
Sergei Golubchik
b381cf843c
mysql-5.5.31 merge
2013-05-07 13:05:09 +02: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
Sergei Golubchik
d3935adf7a
mysql-5.5.29 merge
2013-01-15 19:13:32 +01:00
Tor Didriksen
7873a6e4d7
Use MESSAGE(STATUS ...) as we don't want any popup from the build system.
2012-10-23 13:41:34 +02:00
Sergei Golubchik
16c5c53fc2
mysql 5.5.23 merge
2012-04-10 08:28:13 +02:00
Bjorn Munch
26c08ffa40
Merged some fixes from 7.2 release branches
2012-03-22 16:16:11 +01:00
Sergei Golubchik
0e007344ea
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
Sergei Golubchik
76f0b94bb0
merge with 5.3
...
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
2011-10-19 21:45:18 +02:00
Kent Boortz
02e07e3b51
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
Davi Arnaut
03ff26c759
Remove leftovers from old versions of the code.
2010-07-13 14:34:32 -03:00
Vladislav Vaintroub
3bd236fefb
Add components to INSTALL, some eraly Wix support
2010-02-10 20:23:24 +01:00
Vladislav Vaintroub
7ffdc1d301
fix OSX package names is OSX_DEPLOYMENT_TARGET is specified
2010-02-05 07:39:11 +01:00
Vladislav Vaintroub
9cabc9fd8a
prettification of package names and fix compile bug on OSX/ppc
2010-01-28 11:09:05 +01:00
