Marko Mäkelä
be85d3e61b
Merge 10.2 into 10.3
2019-05-14 17:18:46 +03:00
Marko Mäkelä
26a14ee130
Merge 10.1 into 10.2
2019-05-13 17:54:04 +03:00
Vicențiu Ciorbaru
f177f125d4
Merge branch '5.5' into 10.1
2019-05-11 19:15:57 +03:00
Michal Schorm
17b4f99928
Update FSF address
...
This commit is based on the work of Michal Schorm, rebased on the
earliest MariaDB version.
Th command line used to generate this diff was:
find ./ -type f \
-exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
-exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
-exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \
-exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \
-exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \
-exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
2019-05-10 20:52:00 +03:00
Vladislav Vaintroub
56e7b7eaed
Make possible to use clang on Windows (clang-cl)
...
-DWITH_ASAN can be used as well now, on x64
Fix many clang-cl warnings.
2018-02-20 21:17:36 +00:00
Vladislav Vaintroub
282b652028
Windows, compiling : reenable warning C4996 (deprecated functions)
...
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.
2018-02-07 20:17:38 +00:00
Marko Mäkelä
2c1067166d
Merge bb-10.2-ext into 10.3
2017-10-04 08:24:06 +03:00
Vladislav Vaintroub
7354dc6773
MDEV-13384 - misc Windows warnings fixed
2017-09-28 17:20:46 +00:00
Alexander Barkov
15d98ddc2a
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
2017-04-03 17:35:55 +04:00
Sergei Golubchik
da4d71d10d
Merge branch '10.1' into 10.2
2017-03-30 12:48:42 +02:00
iangilfillan
f0ec34002a
Correct FSF address
2017-03-10 18:21:29 +01:00
Sergei Golubchik
051851b9a6
base64 service
2017-03-10 18:21:27 +01:00
Sergei Golubchik
bd1139ad27
cleanup: generalize my_sha1.cc
...
move most of the code into my_sha.ic, making it independent
from the actual SHAx variant.
2017-03-10 18:21:26 +01:00
Alexander Barkov
86209c7304
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
2016-12-30 15:43:08 +04:00
Sergei Golubchik
4a5d25c338
Merge branch '10.1' into 10.2
2016-12-29 13:23:18 +01:00
Sergey Vojtovich
8f9999b5fc
MDEV-11212 - Clean-up MariaDB atomic operations
...
Removed my_atomic_initialize(): it doesn't make sense anymore.
2016-12-13 16:38:20 +04:00
Sergei Golubchik
a3f11f7549
Merge branch '5.5' into 10.0
2016-09-29 12:31:46 +02:00
Vladislav Vaintroub
0e76054b7b
Feedback plugin : add support for Windows 10 / Server 2016.
...
Also add fallback version string for unknown future versions.
2016-09-28 12:52:01 +00:00
Sergei Golubchik
0aa6817e86
name clash with gnutls on on base64_encode
2016-09-12 17:51:52 +02:00
Alexander Barkov
22a64047d1
MDEV-6274 Collation usage statistics
...
Adding collation usage statistics into the feedback plugin I_S table.
2014-08-11 05:45:45 +04:00
unknown
e5746665c9
merge 10.0-base -> 10.0
2013-09-26 21:20:15 +03:00
unknown
9d83468e78
merge 5.5 -> 10.0-base
2013-09-25 21:07:06 +03:00
Vladislav Vaintroub
b0d98371b9
Update feedback plugin to recognize Windows 8.1 / Windows Server 2012 R2.
2013-09-20 14:37:30 +02:00
Michael Widenius
3143ad589a
Push a lot of small fixes to get larger parts to compile
2013-05-21 22:00:08 +03:00
Sergei Golubchik
0af4b6c6ee
5.5 merge
2013-01-29 15:10:47 +01:00
Sergei Golubchik
aca8e7ed6b
5.3 merge
2013-01-15 19:07:46 +01:00
Vladislav Vaintroub
3fa3561066
Feedback plugin now recognizes Windows 8 / Windows Server 2012.
2012-11-22 18:27:02 +01:00
Michael Widenius
f27c26e95a
Fixed compiler warnings
...
client/mysqltest.cc:
Added cast
plugin/feedback/utils.cc:
Added #ifdef
sql/sql_select.cc:
Added cast
sql/sys_vars.h:
Changed limits to int
support-files/compiler_warnings.supp:
Added suppression
2012-07-06 19:04:52 +03:00
Sergei Golubchik
6e827f3455
mdev-224 plugin usage statistics in the feedback reports
2012-04-18 04:00:08 +02:00
Sergei Golubchik
5c7aa5f2ae
feedback plugin:
...
fix for mem_total on windows
report the time of the data snapshot
2011-11-12 16:41:00 +01:00
Sergei Golubchik
85ac4da3a8
add a missing definition
2011-10-10 17:59:26 +02:00
Vladislav Vaintroub
c9783670c7
Implement uname() on Windows.
...
Also, fix code to get physical memory size.
2011-10-06 20:55:38 +02:00
Sergei Golubchik
031e78dd5b
merge feedback plugin
2011-10-04 16:03:10 +02:00
