Skip to content

Commit cab1d63

Browse files
committed
Merge branch '10.3' into 10.4
2 parents ffe83e8 + ee5124d commit cab1d63

File tree

1,308 files changed

+50181
-28725
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,308 files changed

+50181
-28725
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ pcre/testdata/greppatN4 -text
2525
*.MYD binary
2626
*.MYI binary
2727
*.class binary
28+
*.jar binary
2829

2930
*.c diff=cpp
3031
*.h diff=cpp

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ storage/tokudb/PerconaFT/tools/tokudb_load
220220
storage/tokudb/PerconaFT/tools/tokuftdump
221221
storage/tokudb/PerconaFT/tools/tokuft_logprint
222222
storage/tokudb/PerconaFT/xz/
223+
storage/tokudb/tokudb.cnf
224+
storage/tokudb/tokudb.conf
223225
strings/conf_to_src
224226
support-files/MySQL-shared-compat.spec
225227
support-files/binary-configure

BUILD/SETUP.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ elif [ "x$warning_mode" = "xmaintainer" ]; then
140140
debug_extra_cflags="-g3"
141141
else
142142
# Both C and C++ warnings
143-
warnings="-Wall -Wextra -Wunused -Wwrite-strings -Wno-uninitialized"
143+
warnings="-Wall -Wextra -Wunused -Wwrite-strings -Wno-uninitialized -Wno-strict-aliasing"
144144

145145
# For more warnings, uncomment the following line
146146
# warnings="$warnings -Wshadow"

BUILD/compile-alpha

Lines changed: 0 additions & 24 deletions
This file was deleted.

BUILD/compile-alpha-debug

Lines changed: 0 additions & 12 deletions
This file was deleted.

BUILD/compile-amd64-debug-wsrep

100644100755
File mode changed.

BUILD/compile-amd64-wsrep

100644100755
File mode changed.

BUILD/compile-ia64-debug-max

Lines changed: 0 additions & 25 deletions
This file was deleted.

BUILD/compile-innodb

Lines changed: 0 additions & 25 deletions
This file was deleted.

BUILD/compile-pentium-debug-all

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)