diff options
71 files changed, 179 insertions, 175 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index de503e8927e..b25332a3b53 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -31,12 +31,13 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") + SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) +SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index bb90f7d2a6c..7c13df05ca4 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -305,16 +305,27 @@ FUNCTION(GET_DEPENDEND_OS_LIBS target result) ENDFUNCTION() MACRO(RESTRICT_SYMBOL_EXPORTS target) + SET(VISIBILITY_HIDDEN_FLAG) + IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX) CHECK_C_COMPILER_FLAG("-fvisibility=hidden" HAVE_VISIBILITY_HIDDEN) IF(HAVE_VISIBILITY_HIDDEN) - GET_TARGET_PROPERTY(COMPILE_FLAGS ${target} COMPILE_FLAGS) - IF(NOT COMPILE_FLAGS) - # Avoid COMPILE_FLAGS-NOTFOUND - SET(COMPILE_FLAGS) - ENDIF() - SET_TARGET_PROPERTIES(${target} PROPERTIES - COMPILE_FLAGS "${COMPILE_FLAGS} -fvisibility=hidden") + SET(VISIBILITY_HIDDEN_FLAG "-fvisibility=hidden") + ENDIF() + ENDIF() + + IF(CMAKE_C_COMPILER_ID MATCHES "SunPro") + SET(VISIBILITY_HIDDEN_FLAG "-xldscope=hidden") + ENDIF() + + IF(VISIBILITY_HIDDEN_FLAG) + GET_TARGET_PROPERTY(COMPILE_FLAGS ${target} COMPILE_FLAGS) + IF(NOT COMPILE_FLAGS) + # Avoid COMPILE_FLAGS-NOTFOUND + SET(COMPILE_FLAGS) ENDIF() + SET_TARGET_PROPERTIES(${target} PROPERTIES + COMPILE_FLAGS "${COMPILE_FLAGS} ${VISIBILITY_HIDDEN_FLAG}") ENDIF() + ENDMACRO() diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake index 3d2b4b8949a..d5a4b5c96b0 100644 --- a/cmake/os/SunOS.cmake +++ b/cmake/os/SunOS.cmake @@ -93,3 +93,8 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4 ENDIF() ENDIF() ENDIF() + +IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") + # Unnamed structs and unions + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -features=extensions") +ENDIF() diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index a74802c2314..ac6ce6bc237 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -136,6 +136,7 @@ MACRO(MYSQL_ADD_PLUGIN) SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITONS "MYSQL_SERVER") DTRACE_INSTRUMENT(${target}) ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) + RESTRICT_SYMBOL_EXPORTS(${target}) IF(WITH_EMBEDDED_SERVER) # Embedded library should contain PIC code and be linkable # to shared libraries (on systems that need PIC) diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 24a411e3f1d..49ab92f8bdb 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -116,7 +116,6 @@ MACRO (MYSQL_USE_BUNDLED_READLINE) SET(HAVE_HIST_ENTRY) SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils) SET(READLINE_LIBRARY readline) - FIND_CURSES() ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/readline) ENDMACRO() @@ -126,10 +125,10 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) FIND_LIBRARY(READLINE_LIBRARY NAMES readline) MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY) - SET(CMAKE_REQUIRES_LIBRARIES ${READLINE_LIBRARY}) + SET(CMAKE_REQUIRES_LIBRARIES ${READLINE_LIBRARY} ${CURSES_LIBRARY}) IF(READLINE_LIBRARY AND READLINE_INCLUDE_DIR) - SET(CMAKE_REQUIRED_LIBRARIES ${READLINE_LIBRARY}) + SET(CMAKE_REQUIRED_LIBRARIES ${READLINE_LIBRARY} ${CURSES_LIBRARY}) CHECK_CXX_SOURCE_COMPILES(" #include <stdio.h> #include <readline/readline.h> @@ -175,6 +174,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) ENDIF(READLINE_V5) ENDIF(NEW_READLINE_INTERFACE) ENDIF() + SET(CMAKE_REQUIRES_LIBRARIES ) ENDMACRO() MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) @@ -197,6 +197,7 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) LIBEDIT_INTERFACE) SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) ENDIF() + SET(CMAKE_REQUIRES_LIBRARIES) ENDMACRO() @@ -204,6 +205,7 @@ MACRO (MYSQL_CHECK_READLINE) IF (NOT WIN32) MYSQL_CHECK_MULTIBYTE() SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline") + FIND_CURSES() IF(WITH_READLINE) MYSQL_USE_BUNDLED_READLINE() @@ -217,7 +219,7 @@ MACRO (MYSQL_CHECK_READLINE) ENDIF() ENDIF() SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR}) - SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY}) + SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY}) ENDIF(NOT WIN32) ENDMACRO() diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf index 12db9581469..6c2d812f0cc 100644 --- a/debian/additions/mariadb.cnf +++ b/debian/additions/mariadb.cnf @@ -15,22 +15,3 @@ #default-collation = utf8_general_ci #character_set_server = utf8 #collation_server = utf8_general_ci -# -# * Fine Tuning -# -max_connections = 100 -connect_timeout = 5 -wait_timeout = 600 -sort_buffer_size = 4M -bulk_insert_buffer_size = 16M -tmp_table_size = 32M -max_heap_table_size = 32M -# -# * MyISAM -# -key_buffer_size = 128M -table_cache = 400 -myisam_sort_buffer_size = 512M -concurrent_insert = 2 -read_buffer_size = 2M -read_rnd_buffer_size = 1M diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index ed19dcf5fc9..fd9bcf19977 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -48,15 +48,28 @@ bind-address = 127.0.0.1 # # * Fine Tuning # +max_connections = 100 +connect_timeout = 5 +wait_timeout = 600 max_allowed_packet = 16M thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = 32M +max_heap_table_size = 32M # # * MyISAM # # This replaces the startup script and checks MyISAM tables if needed # the first time they are touched. On error, make copy and try a repair. myisam_recover = BACKUP +key_buffer_size = 128M #open-files-limit = 2000 +table_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M # # * Query Cache Configuration # diff --git a/debian/dist/Debian/mariadb-server-5.5.dirs b/debian/dist/Debian/mariadb-server-5.5.dirs index 40b789231e0..6afd2a1854c 100644 --- a/debian/dist/Debian/mariadb-server-5.5.dirs +++ b/debian/dist/Debian/mariadb-server-5.5.dirs @@ -5,6 +5,6 @@ usr/bin usr/sbin usr/share/man/man8 usr/share/mysql -usr/share/doc/mariadb-server-5.3 +usr/share/doc/mariadb-server-5.5 var/run/mysqld var/lib/mysql-upgrade diff --git a/debian/dist/Debian/mariadb-server-5.5.files b/debian/dist/Debian/mariadb-server-5.5.files index e57752ec54a..b236d19a2c5 100644 --- a/debian/dist/Debian/mariadb-server-5.5.files +++ b/debian/dist/Debian/mariadb-server-5.5.files @@ -30,6 +30,8 @@ usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip usr/share/doc/mariadb-server-5.5/mysqld.sym.gz +usr/share/doc/mariadb-server-5.5/INFO_SRC +usr/share/doc/mariadb-server-5.5/INFO_BIN usr/share/lintian/overrides/mariadb-server-5.5 usr/share/man/man1/msql2mysql.1 usr/share/man/man1/myisamchk.1 diff --git a/debian/dist/Debian/mariadb-server-5.5.postinst b/debian/dist/Debian/mariadb-server-5.5.postinst index 60365711ebf..e3f2df13b4b 100644 --- a/debian/dist/Debian/mariadb-server-5.5.postinst +++ b/debian/dist/Debian/mariadb-server-5.5.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 3c060c99c88..457502882c4 100755 --- a/debian/dist/Debian/rules +++ b/debian/dist/Debian/rules @@ -66,7 +66,7 @@ endif ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \ CC=$${MYSQL_BUILD_CC:-gcc} \ - CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ + CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized $$(case `lsb_release -sc` in (lenny) echo -DWORKAROUND_GCC_4_3_2_BUG ;; esac)"} \ CXX=$${MYSQL_BUILD_CXX:-g++} \ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ cmake .. \ @@ -191,7 +191,7 @@ install: build install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe mkdir -p $(TMP)/usr/share/doc/mariadb-server-5.5/examples # We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf) - # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-5.3/examples/ + # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-5.5/examples/ rm -vf $(TMP)/usr/share/mysql/my-*.cnf \ $(TMP)/usr/share/mysql/config-*.cnf \ $(TMP)/usr/share/mysql/mi_test_all* \ @@ -203,6 +203,9 @@ install: build install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ + install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC + install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN + # mariadb-test mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.dirs b/debian/dist/Ubuntu/mariadb-server-5.5.dirs index 40b789231e0..6afd2a1854c 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.dirs +++ b/debian/dist/Ubuntu/mariadb-server-5.5.dirs @@ -5,6 +5,6 @@ usr/bin usr/sbin usr/share/man/man8 usr/share/mysql -usr/share/doc/mariadb-server-5.3 +usr/share/doc/mariadb-server-5.5 var/run/mysqld var/lib/mysql-upgrade diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.files b/debian/dist/Ubuntu/mariadb-server-5.5.files index d08e6253fe8..e88e52689ae 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.files +++ b/debian/dist/Ubuntu/mariadb-server-5.5.files @@ -32,6 +32,8 @@ usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip usr/share/doc/mariadb-server-5.5/mysqld.sym.gz +usr/share/doc/mariadb-server-5.5/INFO_SRC +usr/share/doc/mariadb-server-5.5/INFO_BIN usr/share/lintian/overrides/mariadb-server-5.5 usr/share/man/man1/msql2mysql.1 usr/share/man/man1/myisamchk.1 diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.postinst b/debian/dist/Ubuntu/mariadb-server-5.5.postinst index 68e24a2d833..a0c351194bb 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.postinst +++ b/debian/dist/Ubuntu/mariadb-server-5.5.postinst @@ -21,7 +21,7 @@ invoke() { fi } -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --innodb=OFF --pbxt=OFF --default-storage-engine=myisam" +MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" test_mysql_access() { mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.py b/debian/dist/Ubuntu/mariadb-server-5.5.py index e0c59c260e2..a1372a3baf5 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.py +++ b/debian/dist/Ubuntu/mariadb-server-5.5.py @@ -1,4 +1,4 @@ -'''apport package hook for mariadb-5.3 +'''apport package hook for mariadb-5.5 (c) 2009 Canonical Ltd. Author: Mathias Gug <mathias.gug@canonical.com> @@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename): continue def add_info(report): - attach_conffiles(report, 'mariadb-server-5.3', conffiles=None) + attach_conffiles(report, 'mariadb-server-5.5', conffiles=None) key = 'Logs' + path_to_key('/var/log/daemon.log') report[key] = "" for line in read_file('/var/log/daemon.log').split('\n'): diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index f0ece68641d..69e1cba2893 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/dist/Ubuntu/rules @@ -191,7 +191,7 @@ install: build install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe mkdir -p $(TMP)/usr/share/doc/mariadb-server-5.5/examples # We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf) - # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-5.3/examples/ + # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-5.5/examples/ rm -vf $(TMP)/usr/share/mysql/my-*.cnf \ $(TMP)/usr/share/mysql/config-*.cnf \ $(TMP)/usr/share/mysql/mi_test_all* \ @@ -203,6 +203,9 @@ install: build install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ + install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC + install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN + # mariadb-test mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides index 3a3dc20c563..a5075e2231a 100644 --- a/debian/mariadb-server-5.5.lintian-overrides +++ b/debian/mariadb-server-5.5.lintian-overrides @@ -1,5 +1,5 @@ -mariadb-server-5.3: command-with-path-in-maintainer-script postinst -mariadb-server-5.3: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' -mariadb-server-5.3: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}' -mariadb-server-5.3: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql -mariadb-server-5.3: statically-linked-binary ./usr/sbin/mysqld +mariadb-server-5.5: command-with-path-in-maintainer-script postinst +mariadb-server-5.5: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' +mariadb-server-5.5: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}' +mariadb-server-5.5: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql +mariadb-server-5.5: statically-linked-binary ./usr/sbin/mysqld diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init index e9dd08481c6..b83316aedea 100644 --- a/debian/mariadb-server-5.5.mysql.init +++ b/debian/mariadb-server-5.5.mysql.init @@ -152,7 +152,7 @@ case "${1:-''}" in if ! mysqld_status check_dead warn; then log_end_msg 1 - log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-5.3/README.Debian.gz!" + log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-5.5/README.Debian.gz!" exit -1 else log_end_msg 0 diff --git a/debian/mariadb-server-5.5.preinst b/debian/mariadb-server-5.5.preinst index 9a7e337d168..1c48fde2837 100644 --- a/debian/mariadb-server-5.5.preinst +++ b/debian/mariadb-server-5.5.preinst @@ -49,7 +49,7 @@ stop_server() { this_version=5.5 # Abort if an NDB cluster is in use. -if egrep -qi -r '^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd' /etc/mysql/; then +if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then db_fset mysql-server/no_upgrade_when_using_ndb seen false || true db_input high mysql-server/no_upgrade_when_using_ndb || true db_go diff --git a/debian/mariadb-server-5.5.templates b/debian/mariadb-server-5.5.templates index 436d599bde3..dfe5f68b319 100644 --- a/debian/mariadb-server-5.5.templates +++ b/debian/mariadb-server-5.5.templates @@ -7,7 +7,7 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: mariadb-server-5.3/really_downgrade +Template: mariadb-server-5.5/really_downgrade Type: boolean Default: false _Description: Really proceed with downgrade? @@ -73,7 +73,7 @@ _Description: Unable to set password for the MariaDB "root" user . You should check the account's password after the package installation. . - Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file + Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for more information. Template: mysql-server/password_mismatch diff --git a/debian/patches/50_mysql-test__db_test.dpatch b/debian/patches/50_mysql-test__db_test.dpatch index 6a5cab91c39..fe356ae46ef 100755 --- a/debian/patches/50_mysql-test__db_test.dpatch +++ b/debian/patches/50_mysql-test__db_test.dpatch @@ -10,12 +10,13 @@ --- old/mysql-test/mysql-test-run.pl 2009-06-16 14:24:09.000000000 +0200 +++ new/mysql-test/mysql-test-run.pl 2009-07-04 00:03:34.000000000 +0200 -@@ -2717,6 +2717,10 @@ +@@ -2717,6 +2717,11 @@ mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", $bootstrap_sql_file); + mtr_tofile($bootstrap_sql_file, "-- Debian removed the default privileges on the 'test' database\n"); + mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n"); ++ mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test\\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');\n"); + + # Add test data for timezone - this is just a subset, on a real diff --git a/debian/po/ar.po b/debian/po/ar.po index 4ac2e393790..7791fbebf2e 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -194,7 +194,7 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "الرجاء قراءة الملف /usr/share/doc/mariadb-server-5.5/README.Debian للمزيد من " diff --git a/debian/po/ca.po b/debian/po/ca.po index 2deeb98a08f..612ed584c96 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -161,7 +161,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/cs.po b/debian/po/cs.po index 6016b8fcf5a..87d9645a4c5 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -197,7 +197,7 @@ msgstr "Po instalaci balíku byste měli heslo ověřit." #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Více informací naleznete v /usr/share/doc/mariadb-server-5.5/README.Debian." diff --git a/debian/po/da.po b/debian/po/da.po index fa4b512a859..a42e3bd67d7 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -198,7 +198,7 @@ msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen." #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Se filen /usr/share/doc/mariadb-server-5.5/README.Debian for yderligere " diff --git a/debian/po/de.po b/debian/po/de.po index 6dd989c7ae6..bbefb910646 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -194,7 +194,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README." diff --git a/debian/po/es.po b/debian/po/es.po index 42efda1896a..cb77ed5a50e 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -226,7 +226,7 @@ msgstr "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Consulte /usr/share/doc/mariadb-server-5.5/README.Debian para más " diff --git a/debian/po/eu.po b/debian/po/eu.po index 019fc5ce090..ef195532d2a 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -188,7 +188,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Mesedez irakurri /usr/share/doc/mariadb-server-5.5/README.Debian fitxategia " diff --git a/debian/po/fr.po b/debian/po/fr.po index 98690573a6b..d9f59de8e3e 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -182,7 +182,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Veuillez consulter le fichier /usr/share/doc/mysql-server-5.5/README.Debian " diff --git a/debian/po/gl.po b/debian/po/gl.po index 7feb5944c02..0f05f62ba6d 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -190,7 +190,7 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete. #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Consulte o ficheiro /usr/share/doc/mariadb-server-5.5/README.Debian para " diff --git a/debian/po/it.po b/debian/po/it.po index 69ef4238c29..b377d9f9fb3 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -181,7 +181,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-" diff --git a/debian/po/ja.po b/debian/po/ja.po index 07a0172c8ca..f63f21fdb8d 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -188,7 +188,7 @@ msgstr "" #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "詳細は /usr/share/doc/mariadb-server-5.5/README.Debian を参照してください。" diff --git a/debian/po/nb.po b/debian/po/nb.po index 9f5b169a534..3dd6ec7ae5c 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -206,7 +206,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/nl.po b/debian/po/nl.po index 758ca85cabd..09cf06c7c47 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -207,7 +207,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index 9ab2f36bdf1..e1a3cad5c24 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -195,7 +195,7 @@ msgstr "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 8a538dfb8e4..26a5ac3d6fa 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -194,7 +194,7 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Por favor, leia o arquivo /usr/share/doc/mariadb-server-5.5/README.Debian " diff --git a/debian/po/ro.po b/debian/po/ro.po index 41baba6e6f8..81d64f37658 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -206,7 +206,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/ru.po b/debian/po/ru.po index 5349416a602..8ce5690ffe1 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -189,7 +189,7 @@ msgstr "Проверьте пароль учётной записи после #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Подробности см. в файле /usr/share/doc/mariadb-server-5.5/README.Debian." diff --git a/debian/po/sv.po b/debian/po/sv.po index 0dd6008bc83..297a2fb6d68 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -182,7 +182,7 @@ msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet." #| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" "Läs filen /usr/share/doc/mariadb-server-5.5/README.Debian för mer " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index f70ac168367..742ea566a84 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -155,7 +155,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index 8fa4522d51e..046c346e85c 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -162,7 +162,7 @@ msgstr "" #. Description #: ../mariadb-server-5.5.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-5.3/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for " "more information." msgstr "" diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index 75c4215bba5..6a2a0dfe234 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -1,2 +1,2 @@ -maintainer-script-lacks-debhelper-token debian/mariadb-server-5.3.postinst -maintainer-script-lacks-debhelper-token debian/mariadb-server-5.3.postrm +maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postinst +maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postrm diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1bef01e3bd5..aa7da22d20c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -173,7 +173,6 @@ my $DEFAULT_SUITES= join(',', qw( optimizer_unfixed_bugs oqgraph parts - pbxt percona perfschema plugins diff --git a/mysql-test/r/information_schema-big.result b/mysql-test/r/information_schema-big.result index d0973af1741..3d4fa27859d 100644 --- a/mysql-test/r/information_schema-big.result +++ b/mysql-test/r/information_schema-big.result @@ -54,7 +54,6 @@ TRIGGERS TRIGGER_SCHEMA USER_PRIVILEGES GRANTEE USER_STATISTICS USER VIEWS TABLE_SCHEMA -PBXT_STATISTICS ID XTRADB_ADMIN_COMMAND result_message SELECT t.table_name, c1.column_name FROM information_schema.tables t @@ -107,5 +106,4 @@ TRIGGERS TRIGGER_SCHEMA USER_PRIVILEGES GRANTEE USER_STATISTICS USER VIEWS TABLE_SCHEMA -PBXT_STATISTICS ID XTRADB_ADMIN_COMMAND result_message diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result index 756b5207714..7eb2bc73d8e 100644 --- a/mysql-test/suite/perfschema/r/all_instances.result +++ b/mysql-test/suite/perfschema/r/all_instances.result @@ -83,7 +83,9 @@ wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data wait/synch/mutex/sql/THD::LOCK_thd_data wait/synch/mutex/sql/THD::LOCK_wakeup_ready wait/synch/mutex/sql/tz_LOCK -select name from rwlock_instances group by name; +select name from rwlock_instances +where name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") +group by name; name wait/synch/rwlock/aria/TRANSLOG_DESCRIPTOR::open_files_lock wait/synch/rwlock/myisam/MYISAM_SHARE::key_root_lock diff --git a/mysql-test/suite/perfschema/t/all_instances.test b/mysql-test/suite/perfschema/t/all_instances.test index 42942725c2b..d5dc6ffc2b2 100644 --- a/mysql-test/suite/perfschema/t/all_instances.test +++ b/mysql-test/suite/perfschema/t/all_instances.test @@ -19,7 +19,10 @@ use performance_schema; # select name from mutex_instances where name not rlike '/(DEBUG_SYNC::mutex)$' group by name; -select name from rwlock_instances group by name; +# CRYPTO_dynlock_value::lock exists only when building with OpenSSL (not YaSSL). +select name from rwlock_instances + where name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock") + group by name; select name from cond_instances where name not rlike '/(DEBUG_SYNC::cond)$' group by name; select event_name from file_instances group by event_name; select name from threads group by name; diff --git a/mysql-test/suite/plugins/r/pam.result b/mysql-test/suite/plugins/r/pam.result index 1c9036c317e..432fb48eb5a 100644 --- a/mysql-test/suite/plugins/r/pam.result +++ b/mysql-test/suite/plugins/r/pam.result @@ -1,5 +1,7 @@ install plugin pam soname 'auth_pam.so'; create user test_pam identified via pam using 'mariadb_mtr'; +create user pam_test; +grant proxy on pam_test to test_pam; # # athentication is successful, challenge/pin are ok # note that current_user() differts from user() @@ -19,4 +21,5 @@ Enter: not very secret challenge Now, the magic number! PIN: **** drop user test_pam; +drop user pam_test; uninstall plugin pam; diff --git a/mysql-test/suite/plugins/t/pam.test b/mysql-test/suite/plugins/t/pam.test index 3f4c563d8dc..2a097b9bfd5 100644 --- a/mysql-test/suite/plugins/t/pam.test +++ b/mysql-test/suite/plugins/t/pam.test @@ -9,9 +9,10 @@ if (!$PAM_SETUP_FOR_MTR) { skip No pam setup for mtr; } ---replace_result .dll .so eval install plugin pam soname '$AUTH_PAM_SO'; create user test_pam identified via pam using 'mariadb_mtr'; +create user pam_test; +grant proxy on pam_test to test_pam; let $plugindir=`SELECT @@global.plugin_dir`; @@ -42,5 +43,6 @@ EOF --remove_file $MYSQLTEST_VARDIR/tmp/pam_good.txt --remove_file $MYSQLTEST_VARDIR/tmp/pam_bad.txt drop user test_pam; +drop user pam_test; uninstall plugin pam; diff --git a/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result b/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result index 0c2685b1a49..70ecef72042 100644 --- a/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result @@ -1,7 +1,4 @@ Valid values are 'ON' and 'OFF' -select @@global.innodb_adaptive_flushing in (0, 1); -@@global.innodb_adaptive_flushing in (0, 1) -1 select @@global.innodb_use_sys_malloc; @@global.innodb_use_sys_malloc 1 diff --git a/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test b/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test index 21f3e904547..699773f4a62 100644 --- a/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test @@ -5,11 +5,14 @@ --source include/have_innodb.inc +# when running with valgring, mtr uses --innodb-use-sys-malloc=0, +# while below we want to see the default value. +--source include/not_valgrind.inc + # # show the global and session values; # --echo Valid values are 'ON' and 'OFF' -select @@global.innodb_adaptive_flushing in (0, 1); select @@global.innodb_use_sys_malloc; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.innodb_use_sys_malloc; diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test index 4adf81a1aed..87c1b76f15c 100644 --- a/mysql-test/t/file_contents.test +++ b/mysql-test/t/file_contents.test @@ -29,13 +29,13 @@ if ($dir_bin eq '/usr/') { # SuSE: "packages/" in the documentation path $dir_docs = glob "$dir_docs/packages/MySQL-server*"; } else { - # RedHat: version number in directory name - $dir_docs = glob "$dir_docs/MySQL-server*"; + # RedHat/Debian: version number in directory name + $dir_docs = glob "$dir_docs/mariadb-server-*"; + $dir_docs = glob "$dir_docs/MySQL-server*" unless -d $dir_docs; } } else { # tar.gz package, Windows, or developer work (in BZR) $dir_docs = $dir_bin; - $dir_docs =~ s|/lib||; if(-d "$dir_docs/docs") { $dir_docs = "$dir_docs/docs"; # package } else { diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test index 926d2474ff2..8b2d4455435 100644 --- a/mysql-test/t/openssl_1.test +++ b/mysql-test/t/openssl_1.test @@ -74,7 +74,7 @@ drop table t1; # --exec echo "this query should not execute;" > $MYSQLTEST_VARDIR/tmp/test.sql # Handle that openssl gives different error messages from YaSSL. ---replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/ +--replace_regex /error:00000001:lib\(0\):func\(0\):reason\(1\)/ASN: bad other signature confirmation/ --error 1 --exec $MYSQL_TEST --ssl-ca=$MYSQL_TEST_DIR/std_data/untrusted-cacert.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 @@ -82,7 +82,7 @@ drop table t1; # Test that we can't open connection to server if we are using # a blank ca # ---replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/ +--replace_regex /error:00000001:lib\(0\):func\(0\):reason\(1\)/ASN: bad other signature confirmation/ --error 1 --exec $MYSQL_TEST --ssl-ca= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 @@ -90,7 +90,7 @@ drop table t1; # Test that we can't open connection to server if we are using # a nonexistent ca file # ---replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/ +--replace_regex /error:00000001:lib\(0\):func\(0\):reason\(1\)/ASN: bad other signature confirmation/ --error 1 --exec $MYSQL_TEST --ssl-ca=nonexisting_file.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 diff --git a/mysql-test/t/variables-big.test b/mysql-test/t/variables-big.test index 60d83e92c0a..58098f4c879 100644 --- a/mysql-test/t/variables-big.test +++ b/mysql-test/t/variables-big.test @@ -74,5 +74,3 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*5; SHOW PROCESSLIST; --enable_warnings -SET @@session.transaction_prealloc_size= @def_var; - diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index b01b109c666..74dae29f235 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -100,14 +100,14 @@ my_bool my_gethwaddr(uchar *to) uint i; for (i= 0; res && i < ifc.ifc_len / sizeof(ifr[0]); i++) { -#ifdef SIOCGIFHWADDR +#ifdef __linux__ if (ioctl(fd, SIOCGIFHWADDR, &ifr[i]) >= 0) res= memcpy_and_test(to, (uchar *)&ifr[i].ifr_hwaddr.sa_data, ETHER_ADDR_LEN); #else /* - A bug in OpenSolaris prevents non-root from getting a mac address: - http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4720634 + A bug in OpenSolaris used to prevent non-root from getting a mac address: + {no url. Oracle killed the old OpenSolaris bug database} Thus, we'll use an alternative method and extract the address from the arp table. diff --git a/plugin/auth_pam/Makefile.am b/plugin/auth_pam/Makefile.am deleted file mode 100644 index be20d393781..00000000000 --- a/plugin/auth_pam/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -EXTRA_LTLIBRARIES = auth_pam.la libauth_pam.la - -pkgplugindir=$(pkglibdir)/plugin -AM_CPPFLAGS = -I$(top_srcdir)/include - -pkgplugin_LTLIBRARIES = @plugin_auth_pam_shared_target@ -auth_pam_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam -auth_pam_la_CFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN -auth_pam_la_SOURCES = auth_pam.c - -noinst_LTLIBRARIES = @plugin_auth_pam_static_target@ -libauth_pam_la_LDFLAGS = -lpam -libauth_pam_la_SOURCES = auth_pam.c - -EXTRA_DIST = plug.in - diff --git a/plugin/auth_pam/plug.in b/plugin/auth_pam/plug.in deleted file mode 100644 index 05af6ce6461..00000000000 --- a/plugin/auth_pam/plug.in +++ /dev/null @@ -1,4 +0,0 @@ -MYSQL_PLUGIN(auth_pam, [PAM Authentication Plugin], [PAM Authentication Plugin]) -MYSQL_PLUGIN_DYNAMIC(auth_pam, [auth_pam.la]) - -AC_CHECK_HEADER([security/pam_appl.h],,[MYSQL_PLUGIN_WITHOUT(auth_pam)]) diff --git a/plugin/feedback/Makefile.am b/plugin/feedback/Makefile.am deleted file mode 100644 index 7d2a61d593f..00000000000 --- a/plugin/feedback/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -pkgplugindir = $(pkglibdir)/plugin -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ - -I$(top_srcdir)/regex -I$(top_srcdir)/sql - -EXTRA_LTLIBRARIES = feedback.la libfeedback.la -pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@ -feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN -feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc - -noinst_LTLIBRARIES = @plugin_feedback_static_target@ -libfeedback_la_SOURCES= feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc - -noinst_HEADERS = feedback.h -EXTRA_DIST = CMakeLists.txt plug.in - diff --git a/plugin/feedback/plug.in b/plugin/feedback/plug.in deleted file mode 100644 index 88a4448321d..00000000000 --- a/plugin/feedback/plug.in +++ /dev/null @@ -1,28 +0,0 @@ -MYSQL_PLUGIN(feedback,[MariaDB User Feedback Plugin], - [MariaDB User Feedback Plugin]) - -dnl Although it's not exactly obvious, top-level CMakeLists.txt parses plug.in -dnl files, in particular looking for what the library name should be. It uses -dnl regexp that matches MYSQL_PLUGIN_DYNAMIC or MYSQL_PLUGIN_STATIC, followed -dnl by an open parenthesys, and the plugin name. Having engine name enclosed in -dnl square brackets below causes this regexp to fail and as a result feedback -dnl plugin will not be considered for dynamic builds on Windows. -dnl Unfortunately, feedback cannot be built dynamically on Windows, because it -dnl needs to access server internals that aren't designed for plugin use and -dnl aren't marked with MYSQL_PLUGIN_IMPORT. -MYSQL_PLUGIN_DYNAMIC([feedback], [feedback.la]) -ifelse(index(AC_PACKAGE_NAME, [MariaDB]), -1, [], [ - -dnl MariaDB and MySQL define static plugins differently. -dnl I only support MariaDB here, for now. -MYSQL_PLUGIN_STATIC(feedback, [libfeedback.la]) - -]) - -dnl MariaDB before 5.5 needs this define: -MYSQL_PLUGIN_DEFINE(feedback, [WITH_FEEDBACK_PLUGIN]) - -MYSQL_PLUGIN_ACTIONS(feedback, [ - AC_CHECK_HEADERS([netdb.h sys/utsname.h]) -]) - diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 5294963c79d..48f0ff2826b 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -347,9 +347,4 @@ IF(WIN32) mysql_upgrade_service.cc COMPONENT Server) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) -ENDIF() - -ADD_CUSTOM_TARGET(show-dist-name - COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" -) - +ENDIF(WIN32) diff --git a/sql/item_sum.cc b/sql/item_sum.cc index c0284e730a8..6e115854f17 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1647,7 +1647,7 @@ double Item_sum_avg::val_real() my_decimal *Item_sum_avg::val_decimal(my_decimal *val) { - my_decimal sum_buff, cnt; + my_decimal cnt; const my_decimal *sum_dec; DBUG_ASSERT(fixed == 1); if (aggr) diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h index c211fc67c84..7db346f68c1 100644 --- a/sql/opt_subselect.h +++ b/sql/opt_subselect.h @@ -279,7 +279,7 @@ public: }; -void advance_sj_state(JOIN *join, const table_map remaining_tables, uint idx, +extern void advance_sj_state(JOIN *join, table_map remaining_tables, uint idx, double *current_record_count, double *current_read_time, POSITION *loose_scan_pos); void restore_prev_sj_state(const table_map remaining_tables, diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h index c153689bb99..155dd64d7e0 100644 --- a/sql/sql_join_cache.h +++ b/sql/sql_join_cache.h @@ -550,7 +550,7 @@ public: BNL_JOIN_ALG, /* Block Nested Loop Join algorithm */ BNLH_JOIN_ALG, /* Block Nested Loop Hash Join algorithm */ BKA_JOIN_ALG, /* Batched Key Access Join algorithm */ - BKAH_JOIN_ALG, /* Batched Key Access with Hash Table Join Algorithm */ + BKAH_JOIN_ALG /* Batched Key Access with Hash Table Join Algorithm */ }; /* diff --git a/sql/sql_select.h b/sql/sql_select.h index 644828fa08c..46e7b7fe95f 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1688,7 +1688,7 @@ void optimize_wo_join_buffering(JOIN *join, uint first_tab, uint last_tab, double *outer_rec_count, double *reopt_cost); Item_equal *find_item_equal(COND_EQUAL *cond_equal, Field *field, bool *inherited_fl); -bool test_if_ref(COND *root_cond, +extern bool test_if_ref(Item *, Item_field *left_item,Item *right_item); inline bool optimizer_flag(THD *thd, uint flag) diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index e529ecbb7a0..04b5fd8d19d 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -252,7 +252,18 @@ IF(WITH_INNODB) SET(WITH_INNOBASE_STORAGE_ENGINE TRUE) ENDIF() + +# On solaris, reduce symbol visibility, so loader does not mix +# the same symbols from builtin innodb and from shared one. +# Only required for old GCC (3.4.3) that does not support hidden visibility +IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC + AND NOT HAVE_VISIBILITY_HIDDEN) + SET(LINKER_SCRIPT "-Wl,-M${CMAKE_CURRENT_SOURCE_DIR}/plugin_exports") +ELSE() + SET(LINKER_SCRIPT) +ENDIF() + MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE MODULE_ONLY MODULE_OUTPUT_NAME ha_innodb - LINK_LIBRARIES ${ZLIB_LIBRARY}) + LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT}) diff --git a/storage/innobase/plugin_exports b/storage/innobase/plugin_exports new file mode 100644 index 00000000000..03b8cf8c217 --- /dev/null +++ b/storage/innobase/plugin_exports @@ -0,0 +1,11 @@ +{ + global: + _mysql_plugin_interface_version_; + _mysql_sizeof_struct_st_plugin_; + _mysql_plugin_declarations_; + thd_wait_service; + my_snprintf_service; + thd_alloc_service; + local: + *; +}; diff --git a/storage/maria/unittest/CMakeLists.txt b/storage/maria/unittest/CMakeLists.txt index ba7c8d324f0..d0cb88b8d9f 100644 --- a/storage/maria/unittest/CMakeLists.txt +++ b/storage/maria/unittest/CMakeLists.txt @@ -76,12 +76,12 @@ MY_ADD_TEST(ma_pagecache_single_1k) ADD_EXECUTABLE(ma_pagecache_single_8k-t ${ma_pagecache_single_src}) SET_TARGET_PROPERTIES(ma_pagecache_single_8k-t - PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=8192") + PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=8192 -DBIG") MY_ADD_TEST(ma_pagecache_single_8k) ADD_EXECUTABLE(ma_pagecache_single_64k-t ${ma_pagecache_single_src}) SET_TARGET_PROPERTIES(ma_pagecache_single_64k-t - PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=65536") + PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=65536 -DBIG") MY_ADD_TEST(ma_pagecache_single_64k) ADD_EXECUTABLE(ma_pagecache_consist_1k-t ${ma_pagecache_consist_src}) diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c index 56d0e55607e..56329a18d7d 100644 --- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c +++ b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c @@ -39,6 +39,7 @@ static TRN *trn= &dummy_transaction_object; #define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512) #define ITERATIONS 2 #define READONLY 0 +#define BIG 1 #else @@ -48,6 +49,7 @@ static TRN *trn= &dummy_transaction_object; #define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512) #define ITERATIONS 2 #define READONLY 1 +#undef BIG #endif /*READONLY_TEST*/ @@ -243,6 +245,15 @@ int main(int argc __attribute__((unused)), char *argv[]) int rc; MY_INIT(argv[0]); + plan(0); // read configuration (MYTAP_CONFIG) +#ifdef BIG + if (skip_big_tests) + { + plan(1); + ok(1, "skipped as big test"); + return 0; + } +#endif load_defaults("my", load_default_groups, &argc, &argv); get_options(&argc, &argv); diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c index 86543ca60fb..83cfdd196f9 100644 --- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c +++ b/storage/maria/unittest/ma_test_loghandler_multithread-t.c @@ -35,7 +35,7 @@ static const char *default_dbug_option; #ifdef MULTIFLUSH_TEST -#define LONG_BUFFER_SIZE (16384L) +#define LONG_BUFFER_SZ (16384L) #define MIN_REC_LENGTH 10 #define SHOW_DIVIDER 20 #define ITERATIONS 10000 @@ -45,7 +45,7 @@ static const char *default_dbug_option; #else -#define LONG_BUFFER_SIZE (512L*1024L*1024L) +#define LONG_BUFFER_SZ (512L*1024L*1024L) #define MIN_REC_LENGTH 30 #define SHOW_DIVIDER 10 #define ITERATIONS 3 @@ -55,6 +55,8 @@ static const char *default_dbug_option; #endif +#define LONG_BUFFER_SIZE (LONG_BUFFER_SZ >> (skip_big_tests ? 4 : 0)) + static uint number_of_writers= WRITERS; static uint number_of_flushers= FLUSHERS; @@ -270,6 +272,7 @@ int main(int argc __attribute__((unused)), int rc; MY_INIT(argv[0]); + // plan read MYTAP_CONFIG so skip_big_tests will be set before using plan(WRITERS + FLUSHERS + ITERATIONS * WRITERS * 3 + FLUSH_ITERATIONS * FLUSHERS ); /* We don't need to do physical syncs in this test */ diff --git a/storage/pbxt/CMakeLists.txt b/storage/pbxt/CMakeLists.txt index 6ddb679bc36..8e78f81ab4a 100644 --- a/storage/pbxt/CMakeLists.txt +++ b/storage/pbxt/CMakeLists.txt @@ -22,6 +22,11 @@ # # This file is used to make the Windows version +IF(NOT WITH_PBXT_STORAGE_ENGINE) + SET(WITHOUT_PBXT 1) +ENDIF(NOT WITH_PBXT_STORAGE_ENGINE) + + SET(PBXT_SOURCES src/bsearch_xt.cc src/bsearch_xt.h diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index 7b228eaa11f..4bc2c26cde2 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -57,7 +57,7 @@ Created 11/5/1995 Heikki Tuuri /* prototypes for new functions added to ha_innodb.cc */ trx_t* innobase_get_trx(); -inline void _increment_page_get_statistics(buf_block_t* block, trx_t* trx) +static inline void _increment_page_get_statistics(buf_block_t* block, trx_t* trx) { ulint block_hash; ulint block_hash_byte; diff --git a/strings/decimal.c b/strings/decimal.c index c0021da6570..1a99816b914 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -2293,7 +2293,11 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2, DBUG_ASSERT(buf0 < to->buf + to->len); *buf0=(dec1)guess; } +#ifdef WORKAROUND_GCC_4_3_2_BUG + dcarry= *(volatile dec1 *)start1; +#else dcarry= *start1; +#endif start1++; } if (mod) |