cleanup
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=65
This commit is contained in:
parent
ed67eaafc4
commit
3b430f6a5e
@ -1,74 +0,0 @@
|
||||
--- storage/pbxt/src/Makefile.am.orig
|
||||
+++ storage/pbxt/src/Makefile.am
|
||||
@@ -40,17 +40,19 @@ libpbxt_la_SOURCES = $(non_mysql_interna
|
||||
# These are the warning Drizzle uses:
|
||||
# DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter
|
||||
|
||||
-libpbxt_la_CXXFLAGS = -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
||||
-libpbxt_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99
|
||||
+libpbxt_la_CXXFLAGS = -shared $(AM_CXXFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN
|
||||
+libpbxt_la_CFLAGS = -shared $(AM_CFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN -std=c99
|
||||
libpbxt_la_LDFLAGS = -module
|
||||
|
||||
noinst_LTLIBRARIES = libpbxt_s.la libpbxt_s_embedded.la libpbxt_s_common.la
|
||||
|
||||
libpbxt_s_common_la_SOURCES = $(non_mysql_internal_sources)
|
||||
+libpbxt_s_common_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing
|
||||
libpbxt_s_la_SOURCES = $(mysql_internal_sources)
|
||||
+libpbxt_s_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing
|
||||
libpbxt_s_la_LIBADD = libpbxt_s_common.la
|
||||
libpbxt_s_embedded_la_SOURCES = $(mysql_internal_sources)
|
||||
-libpbxt_s_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@
|
||||
+libpbxt_s_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing @plugin_embedded_defs@
|
||||
libpbxt_s_embedded_la_LIBADD = libpbxt_s_common.la
|
||||
|
||||
EXTRA_DIST = pbms_enabled.cc win_inttypes.h
|
||||
--- storage/innodb_plugin/buf/buf0flu.c.orig
|
||||
+++ storage/innodb_plugin/buf/buf0flu.c
|
||||
@@ -112,7 +112,9 @@ buf_flush_insert_in_flush_rbt(
|
||||
p_node = rbt_prev(buf_pool->flush_rbt, c_node);
|
||||
|
||||
if (p_node != NULL) {
|
||||
- prev = *rbt_value(buf_page_t*, p_node);
|
||||
+ buf_page_t** value;
|
||||
+ value = rbt_value(buf_page_t*, p_node);
|
||||
+ prev = *value;
|
||||
ut_a(prev != NULL);
|
||||
}
|
||||
|
||||
--- storage/sphinx/Makefile.am.orig
|
||||
+++ storage/sphinx/Makefile.am
|
||||
@@ -35,17 +35,17 @@ pkgplugin_LTLIBRARIES = @plugin_sphinx_s
|
||||
|
||||
ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) \
|
||||
-L$(top_builddir)/libservices -lmysqlservices
|
||||
-ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
||||
+ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN
|
||||
ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
||||
ha_sphinx_la_SOURCES = ha_sphinx.cc
|
||||
|
||||
sphinx_la_LDFLAGS = -module -avoid-version
|
||||
-sphinx_la_CXXFLAGS = $(AM_CXXFLAGS)
|
||||
+sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing
|
||||
sphinx_la_CFLAGS = $(AM_CFLAGS)
|
||||
sphinx_la_SOURCES = snippets_udf.cc
|
||||
|
||||
noinst_LTLIBRARIES = @plugin_sphinx_static_target@
|
||||
-libsphinx_la_CXXFLAGS = $(AM_CXXFLAGS)
|
||||
+libsphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing
|
||||
libsphinx_la_CFLAGS = $(AM_CFLAGS)
|
||||
libsphinx_la_SOURCES= ha_sphinx.cc
|
||||
|
||||
--- storage/xtradb/buf/buf0flu.c.orig
|
||||
+++ storage/xtradb/buf/buf0flu.c
|
||||
@@ -113,7 +113,9 @@ buf_flush_insert_in_flush_rbt(
|
||||
p_node = rbt_prev(buf_pool->flush_rbt, c_node);
|
||||
|
||||
if (p_node != NULL) {
|
||||
- prev = *rbt_value(buf_page_t*, p_node);
|
||||
+ buf_page_t** value;
|
||||
+ value = rbt_value(buf_page_t*, p_node);
|
||||
+ prev = *value;
|
||||
ut_a(prev != NULL);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user