Merge lp:~laurynas-biveinis/percona-server/merge-5.5.35 into lp:percona-server/5.5

Proposed by Laurynas Biveinis on 2013-12-05
Status: Merged
Approved by: Stewart Smith on 2013-12-16
Approved revision: 602
Merged at revision: 608
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.5.35
Merge into: lp:percona-server/5.5
Diff against target: 4405 lines (+1328/-467)
158 files modified
Makefile (+1/-1)
Percona-Server/CMakeLists.txt (+80/-2)
Percona-Server/VERSION (+1/-1)
Percona-Server/cmake/os/Linux.cmake (+5/-2)
Percona-Server/configure.cmake (+4/-0)
Percona-Server/extra/yassl/CMakeLists.txt (+5/-0)
Percona-Server/extra/yassl/taocrypt/CMakeLists.txt (+5/-0)
Percona-Server/include/my_check_opt.h (+69/-0)
Percona-Server/include/myisam.h (+1/-46)
Percona-Server/libmysql/CMakeLists.txt (+2/-0)
Percona-Server/libmysql/authentication_win/CMakeLists.txt (+5/-0)
Percona-Server/man/comp_err.1 (+2/-2)
Percona-Server/man/innochecksum.1 (+2/-2)
Percona-Server/man/msql2mysql.1 (+2/-2)
Percona-Server/man/my_print_defaults.1 (+2/-2)
Percona-Server/man/myisam_ftdump.1 (+2/-2)
Percona-Server/man/myisamchk.1 (+4/-3)
Percona-Server/man/myisamlog.1 (+2/-2)
Percona-Server/man/myisampack.1 (+2/-2)
Percona-Server/man/mysql-stress-test.pl.1 (+2/-2)
Percona-Server/man/mysql-test-run.pl.1 (+2/-2)
Percona-Server/man/mysql.1 (+2/-2)
Percona-Server/man/mysql.server.1 (+2/-2)
Percona-Server/man/mysql_client_test.1 (+2/-2)
Percona-Server/man/mysql_config.1 (+2/-2)
Percona-Server/man/mysql_convert_table_format.1 (+2/-2)
Percona-Server/man/mysql_find_rows.1 (+2/-2)
Percona-Server/man/mysql_fix_extensions.1 (+2/-2)
Percona-Server/man/mysql_install_db.1 (+2/-2)
Percona-Server/man/mysql_plugin.1 (+2/-2)
Percona-Server/man/mysql_secure_installation.1 (+3/-3)
Percona-Server/man/mysql_setpermission.1 (+2/-2)
Percona-Server/man/mysql_tzinfo_to_sql.1 (+2/-2)
Percona-Server/man/mysql_upgrade.1 (+2/-2)
Percona-Server/man/mysql_waitpid.1 (+2/-2)
Percona-Server/man/mysql_zap.1 (+2/-2)
Percona-Server/man/mysqlaccess.1 (+2/-2)
Percona-Server/man/mysqladmin.1 (+2/-2)
Percona-Server/man/mysqlbinlog.1 (+2/-2)
Percona-Server/man/mysqlbug.1 (+2/-2)
Percona-Server/man/mysqlcheck.1 (+2/-2)
Percona-Server/man/mysqld.8 (+2/-2)
Percona-Server/man/mysqld_multi.1 (+2/-2)
Percona-Server/man/mysqld_safe.1 (+3/-3)
Percona-Server/man/mysqldump.1 (+3/-9)
Percona-Server/man/mysqldumpslow.1 (+2/-2)
Percona-Server/man/mysqlhotcopy.1 (+2/-2)
Percona-Server/man/mysqlimport.1 (+2/-2)
Percona-Server/man/mysqlshow.1 (+2/-2)
Percona-Server/man/mysqlslap.1 (+2/-2)
Percona-Server/man/mysqltest.1 (+2/-2)
Percona-Server/man/ndb-common-options.1 (+2/-2)
Percona-Server/man/ndb_blob_tool.1 (+2/-2)
Percona-Server/man/ndb_config.1 (+3/-3)
Percona-Server/man/ndb_cpcd.1 (+2/-2)
Percona-Server/man/ndb_delete_all.1 (+2/-2)
Percona-Server/man/ndb_desc.1 (+2/-2)
Percona-Server/man/ndb_drop_index.1 (+3/-3)
Percona-Server/man/ndb_drop_table.1 (+2/-2)
Percona-Server/man/ndb_error_reporter.1 (+209/-9)
Percona-Server/man/ndb_index_stat.1 (+2/-2)
Percona-Server/man/ndb_mgm.1 (+2/-2)
Percona-Server/man/ndb_mgmd.8 (+42/-5)
Percona-Server/man/ndb_print_backup_file.1 (+2/-2)
Percona-Server/man/ndb_print_schema_file.1 (+2/-2)
Percona-Server/man/ndb_print_sys_file.1 (+2/-2)
Percona-Server/man/ndb_restore.1 (+7/-5)
Percona-Server/man/ndb_select_all.1 (+2/-2)
Percona-Server/man/ndb_select_count.1 (+2/-2)
Percona-Server/man/ndb_show_tables.1 (+2/-2)
Percona-Server/man/ndb_size.pl.1 (+2/-2)
Percona-Server/man/ndb_waiter.1 (+2/-2)
Percona-Server/man/ndbd.8 (+2/-2)
Percona-Server/man/ndbd_redo_log_reader.1 (+41/-2)
Percona-Server/man/ndbinfo_select_all.1 (+2/-2)
Percona-Server/man/ndbmtd.8 (+3/-3)
Percona-Server/man/perror.1 (+2/-2)
Percona-Server/man/replace.1 (+2/-2)
Percona-Server/man/resolve_stack_dump.1 (+2/-2)
Percona-Server/man/resolveip.1 (+2/-2)
Percona-Server/mysql-test/collections/default.experimental (+1/-0)
Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc (+7/-3)
Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test (+1/-1)
Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test (+3/-0)
Percona-Server/mysql-test/include/mtr_check.sql (+2/-0)
Percona-Server/mysql-test/include/search_pattern_in_file.inc (+66/-0)
Percona-Server/mysql-test/mysql-test-run.pl (+2/-2)
Percona-Server/mysql-test/r/openssl_1.result (+1/-1)
Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result (+1/-1)
Percona-Server/mysql-test/suite/innodb/t/innodb.test (+0/-6)
Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result (+3/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result (+14/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result (+6/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result (+6/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result (+6/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test (+4/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test (+51/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test (+1/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test (+1/-1)
Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test (+0/-6)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test (+0/-6)
Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test (+0/-6)
Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test (+0/-6)
Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test (+0/-6)
Percona-Server/mysys/CMakeLists.txt (+5/-0)
Percona-Server/mysys/mf_iocache2.c (+2/-2)
Percona-Server/packaging/WiX/mysql_server.wxs.in (+27/-15)
Percona-Server/packaging/rpm-uln/mysql.spec.sh (+6/-1)
Percona-Server/plugin/semisync/semisync_master.cc (+15/-16)
Percona-Server/scripts/CMakeLists.txt (+0/-1)
Percona-Server/scripts/mysql_system_tables_data.sql (+3/-4)
Percona-Server/scripts/mysql_system_tables_fix.sql (+2/-0)
Percona-Server/sql-common/client.c (+1/-0)
Percona-Server/sql/filesort.cc (+8/-3)
Percona-Server/sql/ha_partition.cc (+20/-3)
Percona-Server/sql/ha_partition.h (+2/-1)
Percona-Server/sql/handler.cc (+6/-0)
Percona-Server/sql/item_strfunc.cc (+3/-1)
Percona-Server/sql/item_sum.cc (+6/-2)
Percona-Server/sql/log_event.cc (+0/-1)
Percona-Server/sql/net_serv.cc (+7/-1)
Percona-Server/sql/opt_range.cc (+10/-9)
Percona-Server/sql/set_var.cc (+1/-1)
Percona-Server/sql/set_var.h (+2/-1)
Percona-Server/sql/sql_acl.cc (+4/-2)
Percona-Server/sql/sql_class.h (+3/-1)
Percona-Server/sql/sql_lex.cc (+1/-0)
Percona-Server/sql/sql_partition.cc (+2/-0)
Percona-Server/sql/sql_prepare.cc (+1/-1)
Percona-Server/sql/sys_vars.cc (+7/-3)
Percona-Server/storage/innobase/btr/btr0cur.c (+22/-9)
Percona-Server/storage/innobase/btr/btr0pcur.c (+19/-27)
Percona-Server/storage/innobase/dict/dict0dict.c (+13/-0)
Percona-Server/storage/innobase/fil/fil0fil.c (+1/-1)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+50/-32)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c (+24/-5)
Percona-Server/storage/innobase/include/btr0cur.h (+15/-0)
Percona-Server/storage/innobase/include/btr0pcur.h (+24/-20)
Percona-Server/storage/innobase/include/btr0pcur.ic (+2/-2)
Percona-Server/storage/innobase/include/btr0sea.h (+0/-2)
Percona-Server/storage/innobase/include/dict0types.h (+5/-0)
Percona-Server/storage/innobase/include/ibuf0ibuf.h (+0/-5)
Percona-Server/storage/innobase/include/log0log.h (+2/-0)
Percona-Server/storage/innobase/log/log0log.c (+109/-1)
Percona-Server/storage/innobase/row/row0sel.c (+78/-31)
Percona-Server/strings/CMakeLists.txt (+5/-0)
Percona-Server/strings/ctype-win1250ch.c (+1/-1)
Percona-Server/support-files/mysql.spec.sh (+5/-0)
Percona-Server/vio/CMakeLists.txt (+5/-0)
Percona-Server/vio/viosslfactories.c (+1/-1)
Percona-Server/zlib/CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.5.35
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve on 2013-12-16
Registry Administrators 2013-12-05 Pending
Review via email: mp+197948@code.launchpad.net

Description of the change

Merge MySQL 5.5.35, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.35 and
taking upstream fixes for
https://bugs.launchpad.net/percona-server/5.5/+bug/1071775 and
https://bugs.launchpad.net/percona-server/5.5/+bug/1203050.

An automerge, except that the upstream fix for
https://bugs.launchpad.net/percona-server/+bug/1223196 was reverted.
The upstream fixes for bug 1223196, bug 1049871, bug 1083377 will be
verified and our fixes will be reverted separately.

http://jenkins.percona.com/job/percona-server-5.5-param/900/

To post a comment you must log in.
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2013-10-23 08:23:08 +0000
+++ Makefile 2013-12-05 18:48:48 +0000
@@ -1,4 +1,4 @@
1MYSQL_VERSION=5.5.341MYSQL_VERSION=5.5.35
2PERCONA_SERVER_VERSION=rel32.02PERCONA_SERVER_VERSION=rel32.0
3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
55
=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt 2013-08-02 09:40:55 +0000
+++ Percona-Server/CMakeLists.txt 2013-12-05 18:48:48 +0000
@@ -185,7 +185,83 @@
185ELSE()185ELSE()
186ADD_DEFINITIONS(-DHAVE_RESPONSE_TIME_DISTRIBUTION)186ADD_DEFINITIONS(-DHAVE_RESPONSE_TIME_DISTRIBUTION)
187ENDIF()187ENDIF()
188 188
189
190include(CheckCSourceCompiles)
191include(CheckCXXSourceCompiles)
192# We need some extra FAIL_REGEX patterns
193# Note that CHECK_C_SOURCE_COMPILES is a misnomer, it will also link.
194MACRO (MY_CHECK_C_COMPILER_FLAG FLAG RESULT)
195 SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
196 SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
197 CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${RESULT}
198 FAIL_REGEX "argument unused during compilation"
199 FAIL_REGEX "unsupported .*option"
200 FAIL_REGEX "unknown .*option"
201 FAIL_REGEX "unrecognized .*option"
202 FAIL_REGEX "ignoring unknown option"
203 FAIL_REGEX "[Ww]arning: [Oo]ption"
204 )
205 SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
206ENDMACRO()
207
208MACRO (MY_CHECK_CXX_COMPILER_FLAG FLAG RESULT)
209 SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
210 SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
211 CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${RESULT}
212 FAIL_REGEX "argument unused during compilation"
213 FAIL_REGEX "unsupported .*option"
214 FAIL_REGEX "unknown .*option"
215 FAIL_REGEX "unrecognized .*option"
216 FAIL_REGEX "ignoring unknown option"
217 FAIL_REGEX "[Ww]arning: [Oo]ption"
218 )
219 SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
220ENDMACRO()
221
222OPTION(WITH_ASAN "Enable address sanitizer" OFF)
223IF (WITH_ASAN)
224 # gcc 4.8.1 and new versions of clang
225 MY_CHECK_C_COMPILER_FLAG("-fsanitize=address" HAVE_C_FSANITIZE)
226 MY_CHECK_CXX_COMPILER_FLAG("-fsanitize=address" HAVE_CXX_FSANITIZE)
227
228 IF(HAVE_C_FSANITIZE AND HAVE_CXX_FSANITIZE)
229 # We switch on basic optimization also for debug builds.
230 # With optimization we may get some warnings, so we switch off -Werror
231 SET(CMAKE_C_FLAGS_DEBUG
232 "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -O1 -Wno-error -fPIC")
233 SET(CMAKE_C_FLAGS_RELWITHDEBINFO
234 "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fsanitize=address -fPIC")
235 SET(CMAKE_CXX_FLAGS_DEBUG
236 "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -O1 -Wno-error -fPIC")
237 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
238 "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fsanitize=address -fPIC")
239 SET(WITH_ASAN_OK 1)
240 ELSE()
241 # older versions of clang
242 MY_CHECK_C_COMPILER_FLAG("-faddress-sanitizer" HAVE_C_FADDRESS)
243 MY_CHECK_CXX_COMPILER_FLAG("-faddress-sanitizer" HAVE_CXX_FFADDRESS)
244
245 IF(HAVE_C_FADDRESS AND HAVE_CXX_FFADDRESS)
246 # We switch on basic optimization also for debug builds.
247 SET(CMAKE_C_FLAGS_DEBUG
248 "${CMAKE_C_FLAGS_DEBUG} -faddress-sanitizer -O1 -fPIC")
249 SET(CMAKE_C_FLAGS_RELWITHDEBINFO
250 "${CMAKE_C_FLAGS_RELWITHDEBINFO} -faddress-sanitizer -fPIC")
251 SET(CMAKE_CXX_FLAGS_DEBUG
252 "${CMAKE_CXX_FLAGS_DEBUG} -faddress-sanitizer -O1 -fPIC")
253 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
254 "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -faddress-sanitizer -fPIC")
255 SET(WITH_ASAN_OK 1)
256 ENDIF()
257 ENDIF()
258
259 IF(NOT WITH_ASAN_OK)
260 MESSAGE(FATAL_ERROR "Do not know how to enable address sanitizer")
261 ENDIF()
262ENDIF()
263
264
189OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) 265OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON)
190IF(ENABLE_DEBUG_SYNC) 266IF(ENABLE_DEBUG_SYNC)
191 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 267 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
@@ -386,7 +462,6 @@
386# (see http://public.kitware.com/Bug/view.php?id=11452)462# (see http://public.kitware.com/Bug/view.php?id=11452)
387SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")463SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
388464
389INCLUDE(CPack)
390IF(UNIX)465IF(UNIX)
391 INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)466 INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
392ENDIF()467ENDIF()
@@ -401,6 +476,7 @@
401 )476 )
402 INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)477 INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
403 INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})478 INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
479
404 IF(UNIX)480 IF(UNIX)
405 INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)481 INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
406 ENDIF()482 ENDIF()
@@ -418,3 +494,5 @@
418 PATTERN "sp-imp-spec.txt" EXCLUDE494 PATTERN "sp-imp-spec.txt" EXCLUDE
419 )495 )
420ENDIF()496ENDIF()
497
498INCLUDE(CPack)
421499
=== modified file 'Percona-Server/VERSION'
--- Percona-Server/VERSION 2013-10-22 13:33:14 +0000
+++ Percona-Server/VERSION 2013-12-05 18:48:48 +0000
@@ -1,4 +1,4 @@
1MYSQL_VERSION_MAJOR=51MYSQL_VERSION_MAJOR=5
2MYSQL_VERSION_MINOR=52MYSQL_VERSION_MINOR=5
3MYSQL_VERSION_PATCH=343MYSQL_VERSION_PATCH=35
4MYSQL_VERSION_EXTRA=4MYSQL_VERSION_EXTRA=
55
=== modified file 'Percona-Server/cmake/os/Linux.cmake'
--- Percona-Server/cmake/os/Linux.cmake 2011-06-30 15:46:53 +0000
+++ Percona-Server/cmake/os/Linux.cmake 2013-12-05 18:48:48 +0000
@@ -1,5 +1,5 @@
11
2# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.2# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
3# 3#
4# This program is free software; you can redistribute it and/or modify4# This program is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by5# it under the terms of the GNU General Public License as published by
@@ -33,7 +33,10 @@
3333
34# Ensure we have clean build for shared libraries34# Ensure we have clean build for shared libraries
35# without unresolved symbols35# without unresolved symbols
36SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")36# Not supported with AddressSanitizer
37IF(NOT WITH_ASAN)
38 SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
39ENDIF()
3740
38# 64 bit file offset support flag41# 64 bit file offset support flag
39SET(_FILE_OFFSET_BITS 64)42SET(_FILE_OFFSET_BITS 64)
4043
=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake 2013-06-26 07:01:13 +0000
+++ Percona-Server/configure.cmake 2013-12-05 18:48:48 +0000
@@ -147,6 +147,10 @@
147147
148 SET(CMAKE_REQUIRED_LIBRARIES 148 SET(CMAKE_REQUIRED_LIBRARIES
149 ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})149 ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
150 # Need explicit pthread for gcc -fsanitize=address
151 IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
152 SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread)
153 ENDIF()
150154
151 LIST(LENGTH CMAKE_REQUIRED_LIBRARIES required_libs_length)155 LIST(LENGTH CMAKE_REQUIRED_LIBRARIES required_libs_length)
152 IF(${required_libs_length} GREATER 0)156 IF(${required_libs_length} GREATER 0)
153157
=== modified file 'Percona-Server/extra/yassl/CMakeLists.txt'
--- Percona-Server/extra/yassl/CMakeLists.txt 2013-02-26 05:35:17 +0000
+++ Percona-Server/extra/yassl/CMakeLists.txt 2013-12-05 18:48:48 +0000
@@ -37,4 +37,9 @@
37ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})37ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
38RESTRICT_SYMBOL_EXPORTS(yassl)38RESTRICT_SYMBOL_EXPORTS(yassl)
3939
40INSTALL_DEBUG_SYMBOLS(yassl)
41IF(MSVC)
42 INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
43ENDIF()
44
4045
4146
=== modified file 'Percona-Server/extra/yassl/taocrypt/CMakeLists.txt'
--- Percona-Server/extra/yassl/taocrypt/CMakeLists.txt 2012-02-13 12:44:54 +0000
+++ Percona-Server/extra/yassl/taocrypt/CMakeLists.txt 2013-12-05 18:48:48 +0000
@@ -36,3 +36,8 @@
36ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})36ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
37RESTRICT_SYMBOL_EXPORTS(taocrypt)37RESTRICT_SYMBOL_EXPORTS(taocrypt)
3838
39INSTALL_DEBUG_SYMBOLS(taocrypt)
40IF(MSVC)
41 INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
42ENDIF()
43
3944
=== added file 'Percona-Server/include/my_check_opt.h'
--- Percona-Server/include/my_check_opt.h 1970-01-01 00:00:00 +0000
+++ Percona-Server/include/my_check_opt.h 2013-12-05 18:48:48 +0000
@@ -0,0 +1,69 @@
1/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
2
3This program is free software; you can redistribute it and/or modify
4it under the terms of the GNU General Public License as published by
5the Free Software Foundation; version 2 of the License.
6
7This program is distributed in the hope that it will be useful,
8but WITHOUT ANY WARRANTY; without even the implied warranty of
9MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10GNU General Public License for more details.
11
12You should have received a copy of the GNU General Public License
13along with this program; if not, write to the Free Software
14Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
15
16#ifndef _my_check_opt_h
17#define _my_check_opt_h
18
19#ifdef __cplusplus
20extern "C" {
21#endif
22
23/*
24 All given definitions needed for MyISAM storage engine:
25 myisamchk.c or/and ha_myisam.cc or/and micheck.c
26 Some definitions are needed by the MySQL parser.
27*/
28
29#define T_AUTO_INC (1UL << 0)
30#define T_AUTO_REPAIR (1UL << 1)
31#define T_BACKUP_DATA (1UL << 2)
32#define T_CALC_CHECKSUM (1UL << 3)
33#define T_CHECK (1UL << 4)
34#define T_CHECK_ONLY_CHANGED (1UL << 5)
35#define T_CREATE_MISSING_KEYS (1UL << 6)
36#define T_DESCRIPT (1UL << 7)
37#define T_DONT_CHECK_CHECKSUM (1UL << 8)
38#define T_EXTEND (1UL << 9)
39#define T_FAST (1UL << 10)
40#define T_FORCE_CREATE (1UL << 11)
41#define T_FORCE_UNIQUENESS (1UL << 12)
42#define T_INFO (1UL << 13)
43/** CHECK TABLE...MEDIUM (the default) */
44#define T_MEDIUM (1UL << 14)
45/** CHECK TABLE...QUICK */
46#define T_QUICK (1UL << 15)
47#define T_READONLY (1UL << 16)
48#define T_REP (1UL << 17)
49#define T_REP_BY_SORT (1UL << 18)
50#define T_REP_PARALLEL (1UL << 19)
51#define T_RETRY_WITHOUT_QUICK (1UL << 20)
52#define T_SAFE_REPAIR (1UL << 21)
53#define T_SILENT (1UL << 22)
54#define T_SORT_INDEX (1UL << 23)
55#define T_SORT_RECORDS (1UL << 24)
56#define T_STATISTICS (1UL << 25)
57#define T_UNPACK (1UL << 26)
58#define T_UPDATE_STATE (1UL << 27)
59#define T_VERBOSE (1UL << 28)
60#define T_VERY_SILENT (1UL << 29)
61#define T_WAIT_FOREVER (1UL << 30)
62#define T_WRITE_LOOP (1UL << 31)
63
64#define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
65
66#ifdef __cplusplus
67}
68#endif
69#endif
070
=== modified file 'Percona-Server/include/myisam.h'
--- Percona-Server/include/myisam.h 2012-02-16 09:48:16 +0000
+++ Percona-Server/include/myisam.h 2013-12-05 18:48:48 +0000
@@ -33,7 +33,7 @@
33#endif33#endif
34#include "my_compare.h"34#include "my_compare.h"
35#include <mysql/plugin.h>35#include <mysql/plugin.h>
3636#include <my_check_opt.h>
37/*37/*
38 Limit max keys according to HA_MAX_POSSIBLE_KEY38 Limit max keys according to HA_MAX_POSSIBLE_KEY
39*/39*/
@@ -312,51 +312,6 @@
312#define MYISAMCHK_VERIFY 2 /* Verify, run repair if failure */312#define MYISAMCHK_VERIFY 2 /* Verify, run repair if failure */
313313
314/*314/*
315 Definitions needed for myisamchk.c
316
317 Entries marked as "QQ to be removed" are NOT used to
318 pass check/repair options to mi_check.c. They are used
319 internally by myisamchk.c or/and ha_myisam.cc and should NOT
320 be stored together with other flags. They should be removed
321 from the following list to make addition of new flags possible.
322*/
323
324#define T_AUTO_INC 1
325#define T_AUTO_REPAIR 2 /* QQ to be removed */
326#define T_BACKUP_DATA 4
327#define T_CALC_CHECKSUM 8
328#define T_CHECK 16 /* QQ to be removed */
329#define T_CHECK_ONLY_CHANGED 32 /* QQ to be removed */
330#define T_CREATE_MISSING_KEYS 64
331#define T_DESCRIPT 128
332#define T_DONT_CHECK_CHECKSUM 256
333#define T_EXTEND 512
334#define T_FAST (1L << 10) /* QQ to be removed */
335#define T_FORCE_CREATE (1L << 11) /* QQ to be removed */
336#define T_FORCE_UNIQUENESS (1L << 12)
337#define T_INFO (1L << 13)
338#define T_MEDIUM (1L << 14)
339#define T_QUICK (1L << 15) /* QQ to be removed */
340#define T_READONLY (1L << 16) /* QQ to be removed */
341#define T_REP (1L << 17)
342#define T_REP_BY_SORT (1L << 18) /* QQ to be removed */
343#define T_REP_PARALLEL (1L << 19) /* QQ to be removed */
344#define T_RETRY_WITHOUT_QUICK (1L << 20)
345#define T_SAFE_REPAIR (1L << 21)
346#define T_SILENT (1L << 22)
347#define T_SORT_INDEX (1L << 23) /* QQ to be removed */
348#define T_SORT_RECORDS (1L << 24) /* QQ to be removed */
349#define T_STATISTICS (1L << 25)
350#define T_UNPACK (1L << 26)
351#define T_UPDATE_STATE (1L << 27)
352#define T_VERBOSE (1L << 28)
353#define T_VERY_SILENT (1L << 29)
354#define T_WAIT_FOREVER (1L << 30)
355#define T_WRITE_LOOP ((ulong) 1L << 31)
356
357#define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
358
359/*
360 Flags used by myisamchk.c or/and ha_myisam.cc that are NOT passed315 Flags used by myisamchk.c or/and ha_myisam.cc that are NOT passed
361 to mi_check.c follows:316 to mi_check.c follows:
362*/317*/
363318
=== modified file 'Percona-Server/libmysql/CMakeLists.txt'
--- Percona-Server/libmysql/CMakeLists.txt 2013-02-04 17:07:22 +0000
+++ Percona-Server/libmysql/CMakeLists.txt 2013-12-05 18:48:48 +0000
@@ -168,8 +168,10 @@
168MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)168MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
169169
170# Visual Studio users need debug static library for debug projects170# Visual Studio users need debug static library for debug projects
171INSTALL_DEBUG_SYMBOLS(clientlib)
171IF(MSVC)172IF(MSVC)
172 INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)173 INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
174 INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
173ENDIF()175ENDIF()
174176
175IF(UNIX)177IF(UNIX)
176178
=== modified file 'Percona-Server/libmysql/authentication_win/CMakeLists.txt'
--- Percona-Server/libmysql/authentication_win/CMakeLists.txt 2011-04-28 19:39:42 +0000
+++ Percona-Server/libmysql/authentication_win/CMakeLists.txt 2013-12-05 18:48:48 +0000
@@ -31,3 +31,8 @@
31# In IDE, group headers in a separate folder.31# In IDE, group headers in a separate folder.
3232
33SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")33SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
34
35INSTALL_DEBUG_SYMBOLS(auth_win_client)
36IF(MSVC)
37 INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
38ENDIF()
3439
=== modified file 'Percona-Server/man/comp_err.1'
--- Percona-Server/man/comp_err.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/comp_err.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBcomp_err\fR2.\" Title: \fBcomp_err\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBCOMP_ERR\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBCOMP_ERR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/innochecksum.1'
--- Percona-Server/man/innochecksum.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/innochecksum.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBinnochecksum\fR2.\" Title: \fBinnochecksum\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBINNOCHECKSUM\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBINNOCHECKSUM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/msql2mysql.1'
--- Percona-Server/man/msql2mysql.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/msql2mysql.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmsql2mysql\fR2.\" Title: \fBmsql2mysql\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMSQL2MYSQL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMSQL2MYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/my_print_defaults.1'
--- Percona-Server/man/my_print_defaults.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/my_print_defaults.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmy_print_defaults\fR2.\" Title: \fBmy_print_defaults\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMY_PRINT_DEFAULTS" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMY_PRINT_DEFAULTS" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/myisam_ftdump.1'
--- Percona-Server/man/myisam_ftdump.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/myisam_ftdump.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisam_ftdump\fR2.\" Title: \fBmyisam_ftdump\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAM_FTDUMP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAM_FTDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/myisamchk.1'
--- Percona-Server/man/myisamchk.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/myisamchk.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisamchk\fR2.\" Title: \fBmyisamchk\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAMCHK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAMCHK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -2098,7 +2098,8 @@
2098\- check data record references index: 32098\- check data record references index: 3
2099Key: 3: Keyblocks used: 98% Packed: \-14% Max levels: 32099Key: 3: Keyblocks used: 98% Packed: \-14% Max levels: 3
2100Total: Keyblocks used: 98% Packed: 89%2100Total: Keyblocks used: 98% Packed: 89%
2101\- check records and index references\fI*** LOTS OF ROW NUMBERS DELETED ***\fR2101\- check records and index references
2102\fI*** LOTS OF ROW NUMBERS DELETED ***\fR
2102Records: 306688 M\&.recordlength: 25 Packed: 83%2103Records: 306688 M\&.recordlength: 25 Packed: 83%
2103Recordspace used: 97% Empty space: 2% Blocks/Record: 1\&.002104Recordspace used: 97% Empty space: 2% Blocks/Record: 1\&.00
2104Record blocks: 306688 Delete blocks: 02105Record blocks: 306688 Delete blocks: 0
21052106
=== modified file 'Percona-Server/man/myisamlog.1'
--- Percona-Server/man/myisamlog.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/myisamlog.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisamlog\fR2.\" Title: \fBmyisamlog\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAMLOG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAMLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/myisampack.1'
--- Percona-Server/man/myisampack.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/myisampack.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmyisampack\fR2.\" Title: \fBmyisampack\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYISAMPACK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYISAMPACK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql-stress-test.pl.1'
--- Percona-Server/man/mysql-stress-test.pl.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql-stress-test.pl.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql-stress-test.pl\fR2.\" Title: \fBmysql-stress-test.pl\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/06/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\-STRESS\-TE" "1" "09/06/2013" "MySQL" "MySQL Database System"10.TH "\FBMYSQL\-STRESS\-TE" "1" "11/04/2013" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql-test-run.pl.1'
--- Percona-Server/man/mysql-test-run.pl.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql-test-run.pl.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql-test-run.pl\fR2.\" Title: \fBmysql-test-run.pl\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/06/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\-TEST\-RUN\" "1" "09/06/2013" "MySQL" "MySQL Database System"10.TH "\FBMYSQL\-TEST\-RUN\" "1" "11/04/2013" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql.1'
--- Percona-Server/man/mysql.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql\fR2.\" Title: \fBmysql\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql.server.1'
--- Percona-Server/man/mysql.server.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql.server.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql.server\fR2.\" Title: \fBmysql.server\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL\&.SERVER\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL\&.SERVER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_client_test.1'
--- Percona-Server/man/mysql_client_test.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_client_test.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_client_test\fR2.\" Title: \fBmysql_client_test\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/06/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_CLIENT_TEST" "1" "09/06/2013" "MySQL" "MySQL Database System"10.TH "\FBMYSQL_CLIENT_TEST" "1" "11/04/2013" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_config.1'
--- Percona-Server/man/mysql_config.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_config.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_config\fR2.\" Title: \fBmysql_config\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_CONFIG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_convert_table_format.1'
--- Percona-Server/man/mysql_convert_table_format.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_convert_table_format.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_convert_table_format\fR2.\" Title: \fBmysql_convert_table_format\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_CONVERT_TAB" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_CONVERT_TAB" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_find_rows.1'
--- Percona-Server/man/mysql_find_rows.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_find_rows.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_find_rows\fR2.\" Title: \fBmysql_find_rows\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_FIND_ROWS\F" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_FIND_ROWS\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_fix_extensions.1'
--- Percona-Server/man/mysql_fix_extensions.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_fix_extensions.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_fix_extensions\fR2.\" Title: \fBmysql_fix_extensions\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_FIX_EXTENSI" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_FIX_EXTENSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_install_db.1'
--- Percona-Server/man/mysql_install_db.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_install_db.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_install_db\fR2.\" Title: \fBmysql_install_db\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_INSTALL_DB\" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_INSTALL_DB\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_plugin.1'
--- Percona-Server/man/mysql_plugin.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_plugin.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_plugin\fR2.\" Title: \fBmysql_plugin\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_PLUGIN\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_PLUGIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_secure_installation.1'
--- Percona-Server/man/mysql_secure_installation.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_secure_installation.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_secure_installation\fR2.\" Title: \fBmysql_secure_installation\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_SECURE_INST" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_SECURE_INST" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -106,7 +106,7 @@
106.RE106.RE
107.\}107.\}
108.PP108.PP
109The script will prompt you to determine which actions to perform\&.109When executed, the script prompts you to determine which actions to perform\&.
110.SH "COPYRIGHT"110.SH "COPYRIGHT"
111.br111.br
112.PP112.PP
113113
=== modified file 'Percona-Server/man/mysql_setpermission.1'
--- Percona-Server/man/mysql_setpermission.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_setpermission.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_setpermission\fR2.\" Title: \fBmysql_setpermission\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_SETPERMISSI" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_SETPERMISSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_tzinfo_to_sql.1'
--- Percona-Server/man/mysql_tzinfo_to_sql.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_tzinfo_to_sql.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_tzinfo_to_sql\fR2.\" Title: \fBmysql_tzinfo_to_sql\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_TZINFO_TO_S" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_TZINFO_TO_S" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_upgrade.1'
--- Percona-Server/man/mysql_upgrade.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_upgrade.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_upgrade\fR2.\" Title: \fBmysql_upgrade\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_UPGRADE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_UPGRADE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_waitpid.1'
--- Percona-Server/man/mysql_waitpid.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_waitpid.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_waitpid\fR2.\" Title: \fBmysql_waitpid\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_WAITPID\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_WAITPID\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysql_zap.1'
--- Percona-Server/man/mysql_zap.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysql_zap.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysql_zap\fR2.\" Title: \fBmysql_zap\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQL_ZAP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQL_ZAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlaccess.1'
--- Percona-Server/man/mysqlaccess.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlaccess.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlaccess\fR2.\" Title: \fBmysqlaccess\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLACCESS\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLACCESS\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqladmin.1'
--- Percona-Server/man/mysqladmin.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqladmin.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqladmin\fR2.\" Title: \fBmysqladmin\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLADMIN\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLADMIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlbinlog.1'
--- Percona-Server/man/mysqlbinlog.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlbinlog.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlbinlog\fR2.\" Title: \fBmysqlbinlog\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLBINLOG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLBINLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlbug.1'
--- Percona-Server/man/mysqlbug.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlbug.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlbug\fR2.\" Title: \fBmysqlbug\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLBUG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLBUG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlcheck.1'
--- Percona-Server/man/mysqlcheck.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlcheck.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlcheck\fR2.\" Title: \fBmysqlcheck\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLCHECK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLCHECK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqld.8'
--- Percona-Server/man/mysqld.8 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqld.8 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqld\fR2.\" Title: \fBmysqld\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqld_multi.1'
--- Percona-Server/man/mysqld_multi.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqld_multi.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqld_multi\fR2.\" Title: \fBmysqld_multi\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLD_MULTI\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLD_MULTI\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqld_safe.1'
--- Percona-Server/man/mysqld_safe.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqld_safe.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqld_safe\fR2.\" Title: \fBmysqld_safe\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLD_SAFE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLD_SAFE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -250,7 +250,7 @@
250malloc()250malloc()
251library\&. Any library can be used by specifying its path name, but there is a shortcut form to enable use of the251library\&. Any library can be used by specifying its path name, but there is a shortcut form to enable use of the
252tcmalloc252tcmalloc
253library that is shipped with binary MySQL distributions for Linux in MySQL 5\&.5\&.253library that is shipped with binary MySQL distributions for Linux in MySQL 5\&.5\&. It is possible that the shortcut form will not work under certain configurations, in which case you should specify a path name instead\&.
254.sp254.sp
255The255The
256\fB\-\-malloc\-lib\fR256\fB\-\-malloc\-lib\fR
257257
=== modified file 'Percona-Server/man/mysqldump.1'
--- Percona-Server/man/mysqldump.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqldump.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqldump\fR2.\" Title: \fBmysqldump\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLDUMP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -105,7 +105,7 @@
105backups with minimal disruption; it can also back up tables from105backups with minimal disruption; it can also back up tables from
106MyISAM106MyISAM
107and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See107and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See
108\m[blue]\fBMySQL Enterprise Backup User\*(Aqs Guide (Version 3\&.8\&.2)\fR\m[]\&\s-2\u[1]\d\s+2\&.108Section\ \&24.2, \(lqMySQL Enterprise Backup\(rq\&.
109.RE109.RE
110.sp110.sp
111.RS 4111.RS 4
@@ -2549,12 +2549,6 @@
2549.PP2549.PP
2550You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.2550You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
2551.sp2551.sp
2552.SH "NOTES"
2553.IP " 1." 4
2554MySQL Enterprise Backup User's Guide (Version 3.8.2)
2555.RS 4
2556\%http://dev.mysql.com/doc/mysql-enterprise-backup/3.8/en/index.html
2557.RE
2558.SH "SEE ALSO"2552.SH "SEE ALSO"
2559For more information, please refer to the MySQL Reference Manual,2553For more information, please refer to the MySQL Reference Manual,
2560which may already be installed locally and which is also available2554which may already be installed locally and which is also available
25612555
=== modified file 'Percona-Server/man/mysqldumpslow.1'
--- Percona-Server/man/mysqldumpslow.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqldumpslow.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqldumpslow\fR2.\" Title: \fBmysqldumpslow\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLDUMPSLOW\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLDUMPSLOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlhotcopy.1'
--- Percona-Server/man/mysqlhotcopy.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlhotcopy.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlhotcopy\fR2.\" Title: \fBmysqlhotcopy\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLHOTCOPY\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLHOTCOPY\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlimport.1'
--- Percona-Server/man/mysqlimport.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlimport.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlimport\fR2.\" Title: \fBmysqlimport\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLIMPORT\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLIMPORT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlshow.1'
--- Percona-Server/man/mysqlshow.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlshow.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlshow\fR2.\" Title: \fBmysqlshow\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLSHOW\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLSHOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqlslap.1'
--- Percona-Server/man/mysqlslap.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqlslap.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqlslap\fR2.\" Title: \fBmysqlslap\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLSLAP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBMYSQLSLAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/mysqltest.1'
--- Percona-Server/man/mysqltest.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/mysqltest.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBmysqltest\fR2.\" Title: \fBmysqltest\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/06/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL7.\" Source: MySQL
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBMYSQLTEST\FR" "1" "09/06/2013" "MySQL" "MySQL Database System"10.TH "\FBMYSQLTEST\FR" "1" "11/04/2013" "MySQL" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb-common-options.1'
--- Percona-Server/man/ndb-common-options.1 2013-10-23 08:23:08 +0000
+++ Percona-Server/man/ndb-common-options.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: Options Common to MySQL Cluster Programs2.\" Title: Options Common to MySQL Cluster Programs
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "OPTIONS COMMON TO MY" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "OPTIONS COMMON TO MY" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_blob_tool.1'
--- Percona-Server/man/ndb_blob_tool.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_blob_tool.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_blob_tool\fR2.\" Title: \fBndb_blob_tool\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_BLOB_TOOL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_BLOB_TOOL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_config.1'
--- Percona-Server/man/ndb_config.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_config.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_config\fR2.\" Title: \fBndb_config\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_CONFIG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -1229,7 +1229,7 @@
1229.\}1229.\}
1230.nf1230.nf
1231shell> \fBndb_config \-\-configinfo \-\-xml\fR1231shell> \fBndb_config \-\-configinfo \-\-xml\fR
1232<configvariables protocolversion="1" ndbversionstring="5\&.5\&.33\-ndb\-7\&.2\&.14"1232<configvariables protocolversion="1" ndbversionstring="5\&.5\&.34\-ndb\-7\&.2\&.15"
1233 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"1233 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
1234 ndbversionbuild="6">1234 ndbversionbuild="6">
1235 <section name="SYSTEM">1235 <section name="SYSTEM">
12361236
=== modified file 'Percona-Server/man/ndb_cpcd.1'
--- Percona-Server/man/ndb_cpcd.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_cpcd.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_cpcd\fR2.\" Title: \fBndb_cpcd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_CPCD\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_CPCD\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_delete_all.1'
--- Percona-Server/man/ndb_delete_all.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_delete_all.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_delete_all\fR2.\" Title: \fBndb_delete_all\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DELETE_ALL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DELETE_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_desc.1'
--- Percona-Server/man/ndb_desc.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_desc.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_desc\fR2.\" Title: \fBndb_desc\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DESC\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DESC\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_drop_index.1'
--- Percona-Server/man/ndb_drop_index.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_drop_index.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_drop_index\fR2.\" Title: \fBndb_drop_index\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DROP_INDEX\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DROP_INDEX\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -123,7 +123,7 @@
123Reading table information for completion of table and column names123Reading table information for completion of table and column names
124You can turn off this feature to get a quicker startup with \-A124You can turn off this feature to get a quicker startup with \-A
125Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.125Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.
126Your MySQL connection id is 7 to server version: 5\&.5\&.33\-ndb\-7\&.2\&.14126Your MySQL connection id is 7 to server version: 5\&.5\&.34\-ndb\-7\&.2\&.15
127Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.127Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
128mysql> \fBSHOW TABLES;\fR128mysql> \fBSHOW TABLES;\fR
129+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+129+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
130130
=== modified file 'Percona-Server/man/ndb_drop_table.1'
--- Percona-Server/man/ndb_drop_table.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_drop_table.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_drop_table\fR2.\" Title: \fBndb_drop_table\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_DROP_TABLE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_DROP_TABLE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_error_reporter.1'
--- Percona-Server/man/ndb_error_reporter.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_error_reporter.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_error_reporter\fR2.\" Title: \fBndb_error_reporter\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_ERROR_REPORTE" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_ERROR_REPORTE" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -44,6 +44,15 @@
44\fBndb_error_reporter\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including44\fBndb_error_reporter\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including
45\fBndb_error_reporter\fR), see45\fBndb_error_reporter\fR), see
46Options Common to MySQL Cluster Programs(1)\&.46Options Common to MySQL Cluster Programs(1)\&.
47.PP
48\fBndb_error_reporter\fR
49did not support the
50\fB\-\-help\fR
51option prior to MySQL Cluster NDB 7\&.2\&.14 (Bug #11756666, Bug #48606)\&. The
52\fB\-\-connection\-timeout\fR
53\fB\-\-dry\-scp\fR, and
54\fB\-\-skip\-nodegroup\fR
55options were also added in this release (Bug #16602002)\&.
47.sp56.sp
48.it 1 an-trap57.it 1 an-trap
49.nr an-no-space-flag 158.nr an-no-space-flag 1
@@ -61,9 +70,30 @@
61Added / Removed70Added / Removed
62T}71T}
63.T&72.T&
73l l l
74l l l
75l l l
64l l l.76l l l.
65T{77T{
66.PP78.PP
79--connection-timeout=timeout
80T}:T{
81Number of seconds to wait when connecting to nodes before timing out\&.
82T}:T{
83.PP
84ADDED: NDB 7\&.2\&.14
85T}
86T{
87.PP
88--dry-scp
89T}:T{
90Disable scp with remote hosts; used only for testing\&.
91T}:T{
92.PP
93ADDED: NDB 7\&.2\&.14
94T}
95T{
96.PP
67--fs97--fs
68T}:T{98T}:T{
69Include file system data in error report; can use a large amount of disk99Include file system data in error report; can use a large amount of disk
@@ -72,6 +102,15 @@
72.PP102.PP
73All MySQL 5\&.5 based releases103All MySQL 5\&.5 based releases
74T}104T}
105T{
106.PP
107--skip-nodegroup=nodegroup_id
108T}:T{
109Skip all nodes in the node group having this ID\&.
110T}:T{
111.PP
112ADDED: NDB 7\&.2\&.14
113T}
75.TE114.TE
76.sp 1115.sp 1
77 Usage116 Usage
@@ -80,32 +119,191 @@
80.RS 4119.RS 4
81.\}120.\}
82.nf121.nf
83ndb_error_reporter \fIpath/to/config\-file\fR [\fIusername\fR] [\-\-fs]122ndb_error_reporter \fIpath/to/config\-file\fR [\fIusername\fR] [\fIoptions\fR]
84.fi123.fi
85.if n \{\124.if n \{\
86.RE125.RE
87.\}126.\}
88.PP127.PP
89This utility is intended for use on a management node host, and requires the path to the management host configuration file (config\&.ini)\&. Optionally, you can supply the name of a user that is able to access the cluster\*(Aqs data nodes using SSH, to copy the data node log files\&. ndb_error_reporter then includes all of these files in archive that is created in the same directory in which it is run\&. The archive is named128This utility is intended for use on a management node host, and requires the path to the management host configuration file (usually named
129config\&.ini)\&. Optionally, you can supply the name of a user that is able to access the cluster\*(Aqs data nodes using SSH, to copy the data node log files\&.
130\fBndb_error_reporter\fR
131then includes all of these files in archive that is created in the same directory in which it is run\&. The archive is named
90ndb_error_report_\fIYYYYMMDDHHMMSS\fR\&.tar\&.bz2, where132ndb_error_report_\fIYYYYMMDDHHMMSS\fR\&.tar\&.bz2, where
91\fIYYYYMMDDHHMMSS\fR133\fIYYYYMMDDHHMMSS\fR
92is a datetime string\&.134is a datetime string\&.
93.PP135.PP
94If the136.\" ndb_error_reporter: options
137\fBndb_error_reporter\fR
138also accepts the options listed here:
139.sp
140.RS 4
141.ie n \{\
142\h'-04'\(bu\h'+03'\c
143.\}
144.el \{\
145.sp -1
146.IP \(bu 2.3
147.\}
148.\" connection-timeout option (ndb_error_reporter)
149\fB\-\-connection\-timeout=\fR\fB\fItimeout\fR\fR
150.TS
151allbox tab(:);
152l l s s
153l l s s
154l l s s
155^ l l s
156^ l l s.
157T{
158\fBIntroduced\fR
159T}:T{
1605\&.5\&.33\-ndb\-7\&.2\&.14
161T}
162T{
163\fBCommand\-Line Format\fR
164T}:T{
165\-\-connection\-timeout=timeout
166T}
167T{
168\ \&
169T}:T{
170\fBPermitted Values\fR
171T}
172:T{
173\fBType\fR
174T}:T{
175integer
176T}
177:T{
178\fBDefault\fR
179T}:T{
1800
181T}
182.TE
183.sp 1
184Wait this many seconds when trying to connect to nodes before timing out\&.
185.RE
186.sp
187.RS 4
188.ie n \{\
189\h'-04'\(bu\h'+03'\c
190.\}
191.el \{\
192.sp -1
193.IP \(bu 2.3
194.\}
195.\" dry-scp option (ndb_error_reporter)
196\fB\-\-dry\-scp\fR
197.TS
198allbox tab(:);
199l l s s
200l l s s
201l l s s
202^ l l s
203^ l l s.
204T{
205\fBIntroduced\fR
206T}:T{
2075\&.5\&.33\-ndb\-7\&.2\&.14
208T}
209T{
210\fBCommand\-Line Format\fR
211T}:T{
212\-\-dry\-scp
213T}
214T{
215\ \&
216T}:T{
217\fBPermitted Values\fR
218T}
219:T{
220\fBType\fR
221T}:T{
222boolean
223T}
224:T{
225\fBDefault\fR
226T}:T{
227TRUE
228T}
229.TE
230.sp 1
231Run
232\fBndb_error_reporter\fR
233without using scp from remote hosts\&. Used for testing only\&.
234.RE
235.sp
236.RS 4
237.ie n \{\
238\h'-04'\(bu\h'+03'\c
239.\}
240.el \{\
241.sp -1
242.IP \(bu 2.3
243.\}
244.\" fs option (ndb_error_reporter)
95\fB\-\-fs\fR245\fB\-\-fs\fR
96is used, then the data node file systems are also copied to the management host and included in the archive that is produced by this script\&. As data node file systems can be extremely large even after being compressed, we ask that you please do246.TS
247allbox tab(:);
248l l s s
249l l s s
250^ l l s
251^ l l s.
252T{
253\fBCommand\-Line Format\fR
254T}:T{
255\-\-fs
256T}
257T{
258\ \&
259T}:T{
260\fBPermitted Values\fR
261T}
262:T{
263\fBType\fR
264T}:T{
265boolean
266T}
267:T{
268\fBDefault\fR
269T}:T{
270FALSE
271T}
272.TE
273.sp 1
274Copy the data node file systems to the management host and include them in the archive\&.
275.sp
276Because data node file systems can be extremely large, even after being compressed, we ask that you please do
97\fInot\fR277\fInot\fR
98send archives created using this option to Oracle unless you are specifically requested to do so\&.278send archives created using this option to Oracle unless you are specifically requested to do so\&.
279.RE
280.sp
281.RS 4
282.ie n \{\
283\h'-04'\(bu\h'+03'\c
284.\}
285.el \{\
286.sp -1
287.IP \(bu 2.3
288.\}
289.\" skip-nodegroup option (ndb_error_reporter)
290\fB\-\-skip\-nodegroup=\fR\fB\fInodegroup_id\fR\fR
99.TS291.TS
100allbox tab(:);292allbox tab(:);
101l l s s293l l s s
102l l s s294l l s s
295l l s s
103^ l l s296^ l l s
104^ l l s.297^ l l s.
105T{298T{
299\fBIntroduced\fR
300T}:T{
3015\&.5\&.33\-ndb\-7\&.2\&.14
302T}
303T{
106\fBCommand\-Line Format\fR304\fBCommand\-Line Format\fR
107T}:T{305T}:T{
108\-\-fs306\-\-connection\-timeout=timeout
109T}307T}
110T{308T{
111\ \&309\ \&
@@ -115,15 +313,17 @@
115:T{313:T{
116\fBType\fR314\fBType\fR
117T}:T{315T}:T{
118boolean316integer
119T}317T}
120:T{318:T{
121\fBDefault\fR319\fBDefault\fR
122T}:T{320T}:T{
123FALSE3210
124T}322T}
125.TE323.TE
126.sp 1324.sp 1
325Skip all nodes belong to the node group having the supplied node group ID\&.
326.RE
127.SH "COPYRIGHT"327.SH "COPYRIGHT"
128.br328.br
129.PP329.PP
130330
=== modified file 'Percona-Server/man/ndb_index_stat.1'
--- Percona-Server/man/ndb_index_stat.1 2013-10-23 08:23:08 +0000
+++ Percona-Server/man/ndb_index_stat.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_index_stat\fR2.\" Title: \fBndb_index_stat\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_INDEX_STAT\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_INDEX_STAT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_mgm.1'
--- Percona-Server/man/ndb_mgm.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_mgm.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_mgm\fR2.\" Title: \fBndb_mgm\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_MGM\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_MGM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_mgmd.8'
--- Percona-Server/man/ndb_mgmd.8 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_mgmd.8 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_mgmd\fR2.\" Title: \fBndb_mgmd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_MGMD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_MGMD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -99,7 +99,9 @@
99T}99T}
100T{100T{
101.PP101.PP
102--configdir=directory102--configdir=directory,
103.PP
104--config-dir=directory
103T}:T{105T}:T{
104Specify the cluster management server\*(Aqs configuration cache directory106Specify the cluster management server\*(Aqs configuration cache directory
105T}:T{107T}:T{
@@ -216,9 +218,9 @@
216T}218T}
217T{219T{
218.PP220.PP
219--config-cache=value221--config-cache[=TRUE|FALSE]
220T}:T{222T}:T{
221Enable the management server configuration cache; ON by default\&.223Enable the management server configuration cache; TRUE by default\&.
222T}:T{224T}:T{
223.PP225.PP
224All MySQL 5\&.5 based releases226All MySQL 5\&.5 based releases
@@ -349,6 +351,7 @@
349allbox tab(:);351allbox tab(:);
350l l s s352l l s s
351l l s s353l l s s
354l l s s
352^ l l s355^ l l s
353^ l l s.356^ l l s.
354T{357T{
@@ -359,6 +362,11 @@
359T{362T{
360\ \&363\ \&
361T}:T{364T}:T{
365\-\-config\-dir=directory
366T}
367T{
368\ \&
369T}:T{
362\fBPermitted Values\fR370\fBPermitted Values\fR
363T}371T}
364:T{372:T{
@@ -387,6 +395,35 @@
387.IP \(bu 2.3395.IP \(bu 2.3
388.\}396.\}
389.\" config-cache option (ndb_mgmd)397.\" config-cache option (ndb_mgmd)
398\fB\-\-config\-cache\fR
399.TS
400allbox tab(:);
401l l s s
402l l s s
403^ l l s
404^ l l s.
405T{
406\fBCommand\-Line Format\fR
407T}:T{
408\-\-config\-cache[=TRUE|FALSE]
409T}
410T{
411\ \&
412T}:T{
413\fBPermitted Values\fR
414T}
415:T{
416\fBType\fR
417T}:T{
418boolean
419T}
420:T{
421\fBDefault\fR
422T}:T{
423TRUE
424T}
425.TE
426.sp 1
390This option, whose default value is427This option, whose default value is
39114281
392(or429(or
393430
=== modified file 'Percona-Server/man/ndb_print_backup_file.1'
--- Percona-Server/man/ndb_print_backup_file.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_print_backup_file.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_print_backup_file\fR2.\" Title: \fBndb_print_backup_file\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_PRINT_BACKUP_" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_PRINT_BACKUP_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_print_schema_file.1'
--- Percona-Server/man/ndb_print_schema_file.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_print_schema_file.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_print_schema_file\fR2.\" Title: \fBndb_print_schema_file\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_PRINT_SCHEMA_" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_PRINT_SCHEMA_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_print_sys_file.1'
--- Percona-Server/man/ndb_print_sys_file.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_print_sys_file.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_print_sys_file\fR2.\" Title: \fBndb_print_sys_file\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_PRINT_SYS_FIL" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_PRINT_SYS_FIL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_restore.1'
--- Percona-Server/man/ndb_restore.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_restore.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_restore\fR2.\" Title: \fBndb_restore\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_RESTORE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_RESTORE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -166,7 +166,9 @@
166T}166T}
167T{167T{
168.PP168.PP
169--restore_data169--restore_data,
170.PP
171-r
170T}:T{172T}:T{
171Restore table data and logs into NDB Cluster using the NDB API173Restore table data and logs into NDB Cluster using the NDB API
172T}:T{174T}:T{
@@ -557,8 +559,8 @@
557.RS 4559.RS 4
558.\}560.\}
559.nf561.nf
560ndb_restore [\-c \fIconnectstring\fR] \-n \fInode_id\fR [\-m] \-b \fIbackup_id\fR \e562ndb_restore [\-c \fIconnection_string\fR] \-n \fInode_id\fR \-b \fIbackup_id\fR \e
561 \-r \-\-backup_path=\fI/path/to/backup/files\fR563 [\-m] \-r \-\-backup_path=\fI/path/to/backup/files\fR
562.fi564.fi
563.if n \{\565.if n \{\
564.RE566.RE
565567
=== modified file 'Percona-Server/man/ndb_select_all.1'
--- Percona-Server/man/ndb_select_all.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_select_all.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_select_all\fR2.\" Title: \fBndb_select_all\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SELECT_ALL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SELECT_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_select_count.1'
--- Percona-Server/man/ndb_select_count.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_select_count.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_select_count\fR2.\" Title: \fBndb_select_count\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SELECT_COUNT\" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SELECT_COUNT\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_show_tables.1'
--- Percona-Server/man/ndb_show_tables.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_show_tables.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_show_tables\fR2.\" Title: \fBndb_show_tables\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SHOW_TABLES\F" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SHOW_TABLES\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_size.pl.1'
--- Percona-Server/man/ndb_size.pl.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_size.pl.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_size.pl\fR2.\" Title: \fBndb_size.pl\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_SIZE\&.PL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_SIZE\&.PL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndb_waiter.1'
--- Percona-Server/man/ndb_waiter.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndb_waiter.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndb_waiter\fR2.\" Title: \fBndb_waiter\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDB_WAITER\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDB_WAITER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndbd.8'
--- Percona-Server/man/ndbd.8 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndbd.8 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbd\fR2.\" Title: \fBndbd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndbd_redo_log_reader.1'
--- Percona-Server/man/ndbd_redo_log_reader.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndbd_redo_log_reader.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbd_redo_log_reader\fR2.\" Title: \fBndbd_redo_log_reader\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBD_REDO_LOG_REA" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBD_REDO_LOG_REA" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -68,6 +68,7 @@
68T}68T}
69.T&69.T&
70l l l70l l l
71l l l
71l l l.72l l l.
72T{73T{
73.PP74.PP
@@ -87,6 +88,15 @@
87.PP88.PP
88All MySQL 5\&.5 based releases89All MySQL 5\&.5 based releases
89T}90T}
91T{
92.PP
93--help
94T}:T{
95Print usage information
96T}:T{
97.PP
98ADDED: NDB 7\&.2\&.15
99T}
90.TE100.TE
91.sp 1101.sp 1
92 Usage102 Usage
@@ -187,6 +197,35 @@
187.sp 1197.sp 1
188\fB\-nocheck\fR: Do not check the log file for errors\&.198\fB\-nocheck\fR: Do not check the log file for errors\&.
189.RE199.RE
200.sp
201.RS 4
202.ie n \{\
203\h'-04'\(bu\h'+03'\c
204.\}
205.el \{\
206.sp -1
207.IP \(bu 2.3
208.\}
209.TS
210allbox tab(:);
211l l s s
212l l s s.
213T{
214\fBIntroduced\fR
215T}:T{
2165\&.5\&.34\-ndb\-7\&.2\&.15
217T}
218T{
219\fBCommand\-Line Format\fR
220T}:T{
221\-\-help
222T}
223.TE
224.sp 1
225\fB\-\-help\fR: Print usage information\&.
226.sp
227Added in MySQL Cluster NDB 7\&.2\&.15\&. (Bug #11749591, Bug #36805)
228.RE
190.PP229.PP
191Like230Like
192\fBndb_print_backup_file\fR231\fBndb_print_backup_file\fR
193232
=== modified file 'Percona-Server/man/ndbinfo_select_all.1'
--- Percona-Server/man/ndbinfo_select_all.1 2013-10-23 08:23:08 +0000
+++ Percona-Server/man/ndbinfo_select_all.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbinfo_select_all\fR2.\" Title: \fBndbinfo_select_all\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBINFO_SELECT_AL" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBINFO_SELECT_AL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/ndbmtd.8'
--- Percona-Server/man/ndbmtd.8 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/ndbmtd.8 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBndbmtd\fR2.\" Title: \fBndbmtd\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBNDBMTD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBNDBMTD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
@@ -151,7 +151,7 @@
151.RS 4151.RS 4
152.\}152.\}
153.nf153.nf
154 ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR_t\fIthread_id\fR,154ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR_t\fIthread_id\fR,
155.fi155.fi
156.if n \{\156.if n \{\
157.RE157.RE
158158
=== modified file 'Percona-Server/man/perror.1'
--- Percona-Server/man/perror.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/perror.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBperror\fR2.\" Title: \fBperror\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBPERROR\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBPERROR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/replace.1'
--- Percona-Server/man/replace.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/replace.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBreplace\fR2.\" Title: \fBreplace\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBREPLACE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBREPLACE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/resolve_stack_dump.1'
--- Percona-Server/man/resolve_stack_dump.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/resolve_stack_dump.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBresolve_stack_dump\fR2.\" Title: \fBresolve_stack_dump\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBRESOLVE_STACK_DUM" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBRESOLVE_STACK_DUM" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/man/resolveip.1'
--- Percona-Server/man/resolveip.1 2013-10-22 13:33:14 +0000
+++ Percona-Server/man/resolveip.1 2013-12-05 18:48:48 +0000
@@ -2,12 +2,12 @@
2.\" Title: \fBresolveip\fR2.\" Title: \fBresolveip\fR
3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]3.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>4.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
5.\" Date: 09/09/20135.\" Date: 11/04/2013
6.\" Manual: MySQL Database System6.\" Manual: MySQL Database System
7.\" Source: MySQL 5.57.\" Source: MySQL 5.5
8.\" Language: English8.\" Language: English
9.\"9.\"
10.TH "\FBRESOLVEIP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System"10.TH "\FBRESOLVEIP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
11.\" -----------------------------------------------------------------11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff12.\" * Define some portability stuff
13.\" -----------------------------------------------------------------13.\" -----------------------------------------------------------------
1414
=== modified file 'Percona-Server/mysql-test/collections/default.experimental'
--- Percona-Server/mysql-test/collections/default.experimental 2013-07-23 12:48:19 +0000
+++ Percona-Server/mysql-test/collections/default.experimental 2013-12-05 18:48:48 +0000
@@ -15,6 +15,7 @@
1515
16rpl.rpl_innodb_bug28430 # Bug#1175442516rpl.rpl_innodb_bug28430 # Bug#11754425
17rpl.rpl_row_sp011 @solaris # Bug#11753919 2011-07-25 sven Several test cases fail on Solaris with error Thread stack overrun17rpl.rpl_row_sp011 @solaris # Bug#11753919 2011-07-25 sven Several test cases fail on Solaris with error Thread stack overrun
18rpl.rpl_spec_variables @solaris # Bug #17337114 2013-08-20 Luis Soares failing on pb2 with timeout for 'CHECK WARNINGS'
1819
19sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun20sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
20sys_vars.wait_timeout_func # Bug#11750645 2010-04-26 alik wait_timeout_func fails21sys_vars.wait_timeout_func # Bug#11750645 2010-04-26 alik wait_timeout_func fails
2122
=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc 2010-11-17 10:16:13 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc 2013-12-05 18:48:48 +0000
@@ -150,10 +150,9 @@
150}150}
151151
152#152#
153# Drops tables and synchronizes master and slave. Note that temporary153# Drops tables and synchronizes master and slave.
154# tables are not explitcily dropped as they will be dropped while
155# closing the connection.
156#154#
155
157if (`SELECT HEX(@commands) = HEX('clean')`)156if (`SELECT HEX(@commands) = HEX('clean')`)
158{157{
159 connection master;158 connection master;
@@ -162,10 +161,15 @@
162161
163 DROP TABLE IF EXISTS nt_xx_1;162 DROP TABLE IF EXISTS nt_xx_1;
164163
164 DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
165 DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
166
165 --let $n= $tot_table167 --let $n= $tot_table
166 while ($n)168 while ($n)
167 { 169 {
168 --eval DROP TABLE IF EXISTS nt_$n170 --eval DROP TABLE IF EXISTS nt_$n
171 --eval DROP TEMPORARY TABLE IF EXISTS tt_tmp_$n
172 --eval DROP TEMPORARY TABLE IF EXISTS nt_tmp_$n
169 --dec $n173 --dec $n
170 }174 }
171175
172176
=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test 2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test 2013-12-05 18:48:48 +0000
@@ -112,7 +112,7 @@
112--echo -------- switch to master --------112--echo -------- switch to master --------
113connection master;113connection master;
114FLUSH LOGS;114FLUSH LOGS;
115115DROP TEMPORARY TABLE IF EXISTS mysqltest1.tmp2;
116DROP DATABASE mysqltest1;116DROP DATABASE mysqltest1;
117117
118--echo End of 5.1 tests118--echo End of 5.1 tests
119119
=== modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test'
--- Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test 2011-07-18 17:18:03 +0000
+++ Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test 2013-12-05 18:48:48 +0000
@@ -38,6 +38,9 @@
38source include/start_slave.inc;38source include/start_slave.inc;
39sync_with_master;39sync_with_master;
40show status like 'slave_open_temp_tables';40show status like 'slave_open_temp_tables';
41connection master;
42drop temporary table if exists t1;
43sync_slave_with_master;
4144
42#45#
43#Bug#34654 RESET SLAVE does not clear LAST_IO_Err* 46#Bug#34654 RESET SLAVE does not clear LAST_IO_Err*
4447
=== modified file 'Percona-Server/mysql-test/include/mtr_check.sql'
--- Percona-Server/mysql-test/include/mtr_check.sql 2012-05-10 07:49:14 +0000
+++ Percona-Server/mysql-test/include/mtr_check.sql 2013-12-05 18:48:48 +0000
@@ -72,6 +72,8 @@
72 mysql.time_zone_transition_type,72 mysql.time_zone_transition_type,
73 mysql.user;73 mysql.user;
7474
75 show status like 'slave_open_temp_tables';
76
75END||77END||
7678
77--79--
7880
=== added file 'Percona-Server/mysql-test/include/search_pattern_in_file.inc'
--- Percona-Server/mysql-test/include/search_pattern_in_file.inc 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/search_pattern_in_file.inc 2013-12-05 18:48:48 +0000
@@ -0,0 +1,66 @@
1# Purpose:
2# Simple search with Perl for a pattern in some file.
3#
4# The advantages compared to thinkable auxiliary constructs using the
5# mysqltest language and SQL are:
6# 1. We do not need a running MySQL server.
7# 2. SQL causes "noise" during debugging and increases the size of logs.
8# Perl code does not disturb at all.
9#
10# The environment variables SEARCH_FILE and SEARCH_PATTERN must be set
11# before sourcing this routine.
12#
13# In case of
14# - SEARCH_FILE and/or SEARCH_PATTERN is not set
15# - SEARCH_FILE cannot be opened
16# - SEARCH_FILE does not contain SEARCH_PATTERN
17# the test will abort immediate.
18# MTR will report something like
19# ....
20# worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 13000..13009
21# main.1st [ pass ] 3
22# innodb.innodb_page_size [ fail ]
23# Test ended at 2011-11-11 18:15:58
24#
25# CURRENT_TEST: innodb.innodb_page_size
26# # ERROR: The file '<name>' does not contain the expected pattern <pattern>
27# mysqltest: In included file "./include/search_pattern_in_file.inc":
28# included from ./include/search_pattern_in_file.inc at line 36:
29# At line 25: command "perl" failed with error 255. my_errno=175
30#
31# The result from queries just before the failure was:
32# ...
33# - saving '<some path>' to '<some path>'
34# main.1st [ pass ] 2
35#
36# Typical use case (check invalid server startup options):
37# let $error_log= $MYSQLTEST_VARDIR/log/my_restart.err;
38# --error 0,1
39# --remove_file $error_log
40# let SEARCH_FILE= $error_log;
41# # Stop the server
42# let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
43# --exec echo "wait" > $restart_file
44# --shutdown_server 10
45# --source include/wait_until_disconnected.inc
46#
47# --error 1
48# --exec $MYSQLD_CMD <whatever wrong setting> > $error_log 2>&1
49# # The server restart aborts
50# let SEARCH_PATTERN= \[ERROR\] Aborting;
51# --source include/search_pattern_in_file.inc
52#
53# Created: 2011-11-11 mleich
54#
55
56perl;
57 use strict;
58 my $search_file= $ENV{'SEARCH_FILE'} or die "SEARCH_FILE not set";
59 my $search_pattern= $ENV{'SEARCH_PATTERN'} or die "SEARCH_PATTERN not set";
60 open(FILE, "$search_file") or die("Unable to open '$search_file': $!\n");
61 read(FILE, my $file_content, 50000, 0);
62 close(FILE);
63 if ( not $file_content =~ m{$search_pattern} ) {
64 die("# ERROR: The file '$search_file' does not contain the expected pattern $search_pattern\n->$file_content<-\n");
65 }
66EOF
067
=== modified file 'Percona-Server/mysql-test/mysql-test-run.pl'
--- Percona-Server/mysql-test/mysql-test-run.pl 2013-08-14 03:52:04 +0000
+++ Percona-Server/mysql-test/mysql-test-run.pl 2013-12-05 18:48:48 +0000
@@ -4364,7 +4364,7 @@
4364 {4364 {
4365 # Remove initial timestamp and look for consecutive identical lines4365 # Remove initial timestamp and look for consecutive identical lines
4366 my $line_pat= $line;4366 my $line_pat= $line;
4367 $line_pat =~ s/^[0-9: ]*//;4367 $line_pat =~ s/^[0-9:\-\+\.TZ ]*//;
4368 if ($line_pat eq $last_pat) {4368 if ($line_pat eq $last_pat) {
4369 $num_rep++;4369 $num_rep++;
4370 } else {4370 } else {
@@ -6013,7 +6013,7 @@
6013 # Special override: also ignore in Pushbuild, some platforms may not have it6013 # Special override: also ignore in Pushbuild, some platforms may not have it
6014 # Now, run ctest and collect output6014 # Now, run ctest and collect output
6015 my $ctest_out= `ctest $ctest_vs 2>&1`;6015 my $ctest_out= `ctest $ctest_vs 2>&1`;
6016 if ($? == $no_ctest && $opt_ctest == -1 && ! defined $ENV{PB2WORKDIR}) {6016 if ($? == $no_ctest && ($opt_ctest == -1 || defined $ENV{PB2WORKDIR})) {
6017 chdir($olddir);6017 chdir($olddir);
6018 return;6018 return;
6019 }6019 }
60206020
=== modified file 'Percona-Server/mysql-test/r/openssl_1.result'
--- Percona-Server/mysql-test/r/openssl_1.result 2012-08-11 10:22:11 +0000
+++ Percona-Server/mysql-test/r/openssl_1.result 2013-12-05 18:48:48 +0000
@@ -83,7 +83,7 @@
83SHOW STATUS LIKE 'Ssl_cipher';83SHOW STATUS LIKE 'Ssl_cipher';
84Variable_name Value84Variable_name Value
85Ssl_cipher AES128-SHA85Ssl_cipher AES128-SHA
86mysqltest: Could not open connection 'default': 2026 SSL connection error: SSL_CTX_new failed86mysqltest: Could not open connection 'default': 2026 SSL connection error: Failed to set ciphers to use
87CREATE TABLE t1(a int);87CREATE TABLE t1(a int);
88INSERT INTO t1 VALUES (1), (2);88INSERT INTO t1 VALUES (1), (2);
8989
9090
=== modified file 'Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result'
--- Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result 2011-12-22 11:05:33 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result 2013-12-05 18:48:48 +0000
@@ -6,5 +6,5 @@
6c6c
7HANDLER bug13510739 READ `primary` NEXT;7HANDLER bug13510739 READ `primary` NEXT;
8c8c
9493
10DROP TABLE bug13510739;10DROP TABLE bug13510739;
1111
=== modified file 'Percona-Server/mysql-test/suite/innodb/t/innodb.test'
--- Percona-Server/mysql-test/suite/innodb/t/innodb.test 2012-05-10 07:49:14 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/innodb.test 2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
1--source include/not_windows_embedded.inc
2# remove this when
3# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
4# .\sync\sync0sync.c line 324
5# is fixed
6
7#######################################################################1#######################################################################
8# #2# #
9# Please, DO NOT TOUCH this file as well as the innodb.result file. #3# Please, DO NOT TOUCH this file as well as the innodb.result file. #
104
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result 2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result 2013-12-05 18:48:48 +0000
@@ -15,4 +15,7 @@
15master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp15master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp
16master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp16master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp
17master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp17master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp
18DROP TEMPORARY TABLE tmp;
19DROP TEMPORARY TABLE tmp1;
20DROP TEMPORARY TABLE tmp2;
18include/rpl_end.inc21include/rpl_end.inc
1922
=== added file 'Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result 2013-12-05 18:48:48 +0000
@@ -0,0 +1,14 @@
1include/master-slave.inc
2[connection master]
3SET @debug_saved= @@GLOBAL.DEBUG;
4CREATE TABLE t (i INT);
5SET GLOBAL DEBUG= "d,wait_after_binlog_EOF";
6INSERT INTO t VALUES (1);
7INSERT INTO t VALUES (2);
8FLUSH LOGS;
9SET DEBUG_SYNC= 'now SIGNAL signal.rotate_finished';
10include/diff_tables.inc [master:t,slave:t]
11SET @@GLOBAL.DEBUG= @debug_saved;
12SET DEBUG_SYNC= 'RESET';
13DROP TABLE t;
14include/rpl_end.inc
015
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result 2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result 2013-12-05 18:48:48 +0000
@@ -42,4 +42,5 @@
42 `created` datetime DEFAULT NULL42 `created` datetime DEFAULT NULL
43) ENGINE=MyISAM DEFAULT CHARSET=latin143) ENGINE=MyISAM DEFAULT CHARSET=latin1
44drop table t2,t3,t5;44drop table t2,t3,t5;
45drop temporary table t4;
45include/rpl_end.inc46include/rpl_end.inc
4647
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result 2013-07-27 12:05:02 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result 2013-12-05 18:48:48 +0000
@@ -1554,8 +1554,14 @@
1554SET @commands= 'clean';1554SET @commands= 'clean';
1555DROP TABLE IF EXISTS tt_xx_1;1555DROP TABLE IF EXISTS tt_xx_1;
1556DROP TABLE IF EXISTS nt_xx_1;1556DROP TABLE IF EXISTS nt_xx_1;
1557DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
1558DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
1557DROP TABLE IF EXISTS nt_2;1559DROP TABLE IF EXISTS nt_2;
1560DROP TEMPORARY TABLE IF EXISTS tt_tmp_2;
1561DROP TEMPORARY TABLE IF EXISTS nt_tmp_2;
1558DROP TABLE IF EXISTS nt_1;1562DROP TABLE IF EXISTS nt_1;
1563DROP TEMPORARY TABLE IF EXISTS tt_tmp_1;
1564DROP TEMPORARY TABLE IF EXISTS nt_tmp_1;
1559DROP TABLE IF EXISTS tt_2;1565DROP TABLE IF EXISTS tt_2;
1560DROP TABLE IF EXISTS tt_1;1566DROP TABLE IF EXISTS tt_1;
1561SET @commands= '';1567SET @commands= '';
15621568
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2012-12-04 16:09:48 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2013-12-05 18:48:48 +0000
@@ -85,6 +85,7 @@
85include/assert.inc [Table t3 should contain 100 lines on the slave]85include/assert.inc [Table t3 should contain 100 lines on the slave]
86unlock tables;86unlock tables;
87drop table if exists t1,t2,t3,t4;87drop table if exists t1,t2,t3,t4;
88drop temporary table temp_table;
88End of 4.1 tests89End of 4.1 tests
89show binlog events in 'non existing_binlog_file';90show binlog events in 'non existing_binlog_file';
90ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log91ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
9192
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result 2013-07-27 12:05:02 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result 2013-12-05 18:48:48 +0000
@@ -1619,8 +1619,14 @@
1619SET @commands= 'clean';1619SET @commands= 'clean';
1620DROP TABLE IF EXISTS tt_xx_1;1620DROP TABLE IF EXISTS tt_xx_1;
1621DROP TABLE IF EXISTS nt_xx_1;1621DROP TABLE IF EXISTS nt_xx_1;
1622DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
1623DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
1622DROP TABLE IF EXISTS nt_2;1624DROP TABLE IF EXISTS nt_2;
1625DROP TEMPORARY TABLE IF EXISTS tt_tmp_2;
1626DROP TEMPORARY TABLE IF EXISTS nt_tmp_2;
1623DROP TABLE IF EXISTS nt_1;1627DROP TABLE IF EXISTS nt_1;
1628DROP TEMPORARY TABLE IF EXISTS tt_tmp_1;
1629DROP TEMPORARY TABLE IF EXISTS nt_tmp_1;
1624DROP TABLE IF EXISTS tt_2;1630DROP TABLE IF EXISTS tt_2;
1625DROP TABLE IF EXISTS tt_1;1631DROP TABLE IF EXISTS tt_1;
1626SET @commands= '';1632SET @commands= '';
16271633
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2011-07-18 17:18:03 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2013-12-05 18:48:48 +0000
@@ -23,6 +23,7 @@
23show status like 'slave_open_temp_tables';23show status like 'slave_open_temp_tables';
24Variable_name Value24Variable_name Value
25Slave_open_temp_tables 025Slave_open_temp_tables 0
26drop temporary table if exists t1;
26include/stop_slave.inc27include/stop_slave.inc
27reset slave;28reset slave;
28include/check_slave_no_error.inc29include/check_slave_no_error.inc
2930
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result 2011-03-18 14:16:17 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result 2013-12-05 18:48:48 +0000
@@ -48,6 +48,7 @@
480480
49kill @id;49kill @id;
50drop table t2;50drop table t2;
51drop temporary table t3;
51Got one of the listed errors52Got one of the listed errors
52include/wait_for_slave_sql_error_and_skip.inc [errno=1053]53include/wait_for_slave_sql_error_and_skip.inc [errno=1053]
53select count(*) from t1;54select count(*) from t1;
5455
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result 2013-07-27 12:05:02 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result 2013-12-05 18:48:48 +0000
@@ -1604,8 +1604,14 @@
1604SET @commands= 'clean';1604SET @commands= 'clean';
1605DROP TABLE IF EXISTS tt_xx_1;1605DROP TABLE IF EXISTS tt_xx_1;
1606DROP TABLE IF EXISTS nt_xx_1;1606DROP TABLE IF EXISTS nt_xx_1;
1607DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1;
1608DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1;
1607DROP TABLE IF EXISTS nt_2;1609DROP TABLE IF EXISTS nt_2;
1610DROP TEMPORARY TABLE IF EXISTS tt_tmp_2;
1611DROP TEMPORARY TABLE IF EXISTS nt_tmp_2;
1608DROP TABLE IF EXISTS nt_1;1612DROP TABLE IF EXISTS nt_1;
1613DROP TEMPORARY TABLE IF EXISTS tt_tmp_1;
1614DROP TEMPORARY TABLE IF EXISTS nt_tmp_1;
1609DROP TABLE IF EXISTS tt_2;1615DROP TABLE IF EXISTS tt_2;
1610DROP TABLE IF EXISTS tt_1;1616DROP TABLE IF EXISTS tt_1;
1611SET @commands= '';1617SET @commands= '';
16121618
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result 2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result 2013-12-05 18:48:48 +0000
@@ -79,6 +79,7 @@
79FLUSH LOGS;79FLUSH LOGS;
80-------- switch to master --------80-------- switch to master --------
81FLUSH LOGS;81FLUSH LOGS;
82DROP TEMPORARY TABLE IF EXISTS mysqltest1.tmp2;
82DROP DATABASE mysqltest1;83DROP DATABASE mysqltest1;
83End of 5.1 tests84End of 5.1 tests
84#85#
8586
=== modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result'
--- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2011-07-18 17:18:03 +0000
+++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2013-12-05 18:48:48 +0000
@@ -23,6 +23,7 @@
23show status like 'slave_open_temp_tables';23show status like 'slave_open_temp_tables';
24Variable_name Value24Variable_name Value
25Slave_open_temp_tables 125Slave_open_temp_tables 1
26drop temporary table if exists t1;
26include/stop_slave.inc27include/stop_slave.inc
27reset slave;28reset slave;
28include/check_slave_no_error.inc29include/check_slave_no_error.inc
2930
=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test 2010-12-19 17:07:28 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test 2013-12-05 18:48:48 +0000
@@ -38,4 +38,8 @@
38CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp;38CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp;
39source include/show_binlog_events.inc;39source include/show_binlog_events.inc;
4040
41DROP TEMPORARY TABLE tmp;
42DROP TEMPORARY TABLE tmp1;
43DROP TEMPORARY TABLE tmp2;
44
41--source include/rpl_end.inc45--source include/rpl_end.inc
4246
=== added file 'Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test 1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test 2013-12-05 18:48:48 +0000
@@ -0,0 +1,51 @@
1#
2# Whenever the mysql_binlog_send method (dump thread) reaches the
3# end of file when reading events from the binlog, before checking
4# if it should wait for more events, there was a test to check if
5# the file being read was still active, i.e, it was the last known
6# binlog. However, it was possible that something was written to
7# the binary log and then a rotation would happen, after EOF was
8# detected and before the check for active was performed. In this
9# case, the end of the binary log would not be read by the dump
10# thread, and this would cause the slave to lose updates.
11#
12# This test verifies that the problem has been fixed. It waits
13# during this window while forcing a rotation in the binlog.
14#
15--source include/have_debug.inc
16--source include/master-slave.inc
17
18--connection master
19
20SET @debug_saved= @@GLOBAL.DEBUG;
21
22CREATE TABLE t (i INT);
23
24# When reaching the EOF the dump thread will wait before deciding if
25# it should move to a new binlong file.
26SET GLOBAL DEBUG= "d,wait_after_binlog_EOF";
27
28INSERT INTO t VALUES (1);
29
30--sleep 1
31
32# A insert and a rotate happens before the decision
33INSERT INTO t VALUES (2);
34FLUSH LOGS;
35
36SET DEBUG_SYNC= 'now SIGNAL signal.rotate_finished';
37
38--sync_slave_with_master
39
40# All the rows should be sent to the slave.
41--let $diff_tables=master:t,slave:t
42--source include/diff_tables.inc
43
44##Clean up
45--connection master
46
47SET @@GLOBAL.DEBUG= @debug_saved;
48SET DEBUG_SYNC= 'RESET';
49
50DROP TABLE t;
51--source include/rpl_end.inc
052
=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test 2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test 2013-12-05 18:48:48 +0000
@@ -43,6 +43,7 @@
43show create table t5;43show create table t5;
44connection master;44connection master;
45drop table t2,t3,t5;45drop table t2,t3,t5;
46drop temporary table t4;
46sync_slave_with_master;47sync_slave_with_master;
4748
48# End of 4.1 tests49# End of 4.1 tests
4950
=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test 2012-12-04 16:09:48 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test 2013-12-05 18:48:48 +0000
@@ -218,6 +218,7 @@
218#clean up218#clean up
219connection master;219connection master;
220drop table if exists t1,t2,t3,t4;220drop table if exists t1,t2,t3,t4;
221drop temporary table temp_table;
221sync_slave_with_master;222sync_slave_with_master;
222223
223--echo End of 4.1 tests224--echo End of 4.1 tests
224225
=== modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test'
--- Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test 2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test 2013-12-05 18:48:48 +0000
@@ -91,8 +91,8 @@
91sleep 3;91sleep 3;
92select (@id := id) - id from t2;92select (@id := id) - id from t2;
93kill @id;93kill @id;
94# We don't drop t3 as this is a temporary table
95drop table t2;94drop table t2;
95drop temporary table t3;
96connection master;96connection master;
97# The get_lock function causes warning for unsafe statement.97# The get_lock function causes warning for unsafe statement.
98--disable_warnings98--disable_warnings
9999
=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test 2010-05-25 07:36:06 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test 2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
1--source include/not_windows_embedded.inc
2# remove this when
3# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
4# .\sync\sync0sync.c line 324
5# is fixed
6
7#################### mysql-test\t\identity_func.test ##########################1#################### mysql-test\t\identity_func.test ##########################
8# #2# #
9# Variable Name: identity #3# Variable Name: identity #
104
=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test 2010-05-25 07:36:06 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test 2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
1--source include/not_windows_embedded.inc
2# remove this when
3# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
4# .\sync\sync0sync.c line 324
5# is fixed
6
7################# mysql-test\t\innodb_autoinc_lock_mode_func.test ############1################# mysql-test\t\innodb_autoinc_lock_mode_func.test ############
8# #2# #
9# Variable Name: innodb_autoinc_lock_mode #3# Variable Name: innodb_autoinc_lock_mode #
104
=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test 2010-05-25 07:36:06 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test 2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
1--source include/not_windows_embedded.inc
2# remove this when
3# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
4# .\sync\sync0sync.c line 324
5# is fixed
6
7################# mysql-test\t\last_insert_id_func.test #######################1################# mysql-test\t\last_insert_id_func.test #######################
8# #2# #
9# Variable Name: last_insert_id #3# Variable Name: last_insert_id #
104
=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test 2010-06-17 20:51:35 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test 2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
1--source include/not_windows_embedded.inc
2# remove this when
3# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
4# .\sync\sync0sync.c line 324
5# is fixed
6
7############## mysql-test\t\storage_engine_basic.test ##################1############## mysql-test\t\storage_engine_basic.test ##################
8# #2# #
9# # 3# #
104
=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test 2010-06-07 08:47:04 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test 2013-12-05 18:48:48 +0000
@@ -1,9 +1,3 @@
1--source include/not_windows_embedded.inc
2# remove this when
3# Bug#53947 InnoDB: Assertion failure in thread 4224 in file
4# .\sync\sync0sync.c line 324
5# is fixed
6
7############# mysql-test\t\tx_isolation_func.test #######################################1############# mysql-test\t\tx_isolation_func.test #######################################
8# #2# #
9# Variable Name: tx_isolation #3# Variable Name: tx_isolation #
104
=== modified file 'Percona-Server/mysys/CMakeLists.txt'
--- Percona-Server/mysys/CMakeLists.txt 2013-08-02 09:40:55 +0000
+++ Percona-Server/mysys/CMakeLists.txt 2013-12-05 18:48:48 +0000
@@ -77,3 +77,8 @@
77ADD_EXECUTABLE(thr_lock thr_lock.c)77ADD_EXECUTABLE(thr_lock thr_lock.c)
78TARGET_LINK_LIBRARIES(thr_lock mysys)78TARGET_LINK_LIBRARIES(thr_lock mysys)
79SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")79SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
80
81INSTALL_DEBUG_SYMBOLS(mysys)
82IF(MSVC)
83 INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
84ENDIF()
8085
=== modified file 'Percona-Server/mysys/mf_iocache2.c'
--- Percona-Server/mysys/mf_iocache2.c 2013-06-27 15:35:20 +0000
+++ Percona-Server/mysys/mf_iocache2.c 2013-12-05 18:48:48 +0000
@@ -419,7 +419,7 @@
419 {419 {
420 register int iarg;420 register int iarg;
421 size_t length2;421 size_t length2;
422 char buff[17];422 char buff[32];
423423
424 iarg = va_arg(args, int);424 iarg = va_arg(args, int);
425 if (*fmt == 'd')425 if (*fmt == 'd')
@@ -454,7 +454,7 @@
454 {454 {
455 register long iarg;455 register long iarg;
456 size_t length2;456 size_t length2;
457 char buff[17];457 char buff[32];
458458
459 iarg = va_arg(args, long);459 iarg = va_arg(args, long);
460 if (*++fmt == 'd')460 if (*++fmt == 'd')
461461
=== modified file 'Percona-Server/packaging/WiX/mysql_server.wxs.in'
--- Percona-Server/packaging/WiX/mysql_server.wxs.in 2013-02-20 11:41:43 +0000
+++ Percona-Server/packaging/WiX/mysql_server.wxs.in 2013-12-05 18:48:48 +0000
@@ -70,10 +70,10 @@
70 Installed70 Installed
71 </Custom>71 </Custom>
72 </InstallExecuteSequence>72 </InstallExecuteSequence>
73 <InstallUISequence>73 <InstallUISequence>
74 <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->74 <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
75 <AppSearch After="FindRelatedProducts"/>75 <AppSearch After="FindRelatedProducts"/>
76 </InstallUISequence>76 </InstallUISequence>
77 77
78 <!-- Find previous installation -->78 <!-- Find previous installation -->
79 <Property Id="INSTALLDIR">79 <Property Id="INSTALLDIR">
@@ -83,31 +83,43 @@
83 Name="InstallLocation"83 Name="InstallLocation"
84 Type="raw" />84 Type="raw" />
85 </Property>85 </Property>
86 <Property Id="OLDERVERSION">86 <?if @Platform@ != "x64" ?>
87 <RegistrySearch Id="FindOlderVersion"87 <Property Id="OLDERVERSION">
88 Root="HKLM"88 <RegistrySearch Id="FindOlderVersion"
89 Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"89 Root="HKLM"
90 Name="DisplayVersion"90 Win64 = "no"
91 Type="raw" />91 Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
92 </Property>92 Name="DisplayVersion"
93 <Property Id="DATADIR">93 Type="raw" />
94 </Property>
95 <?else ?>
96 <Property Id="OLDERVERSION">
97 <RegistrySearch Id="FindOlderVersion"
98 Root="HKLM"
99 Win64 = "yes"
100 Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
101 Name="DisplayVersion"
102 Type="raw" />
103 </Property>
104 <?endif ?>
105 <Property Id="DATADIR">
94 <RegistrySearch Id="FindDataDir"106 <RegistrySearch Id="FindDataDir"
95 Root="HKLM"107 Root="HKLM"
96 Key="SOFTWARE\MySQL AB\[ProductName]"108 Key="SOFTWARE\MySQL AB\[ProductName]"
97 Name="DataLocation"109 Name="DataLocation"
98 Type="raw" />110 Type="raw" />
99 </Property>111 </Property>
100 <Property Id="INSTALLDIR2">112 <Property Id="INSTALLDIR2">
101 <RegistrySearch Id="FindInstallLocation2"113 <RegistrySearch Id="FindInstallLocation2"
102 Root="HKLM"114 Root="HKLM"
103 Key="SOFTWARE\MySQL AB\[ProductName]"115 Key="SOFTWARE\MySQL AB\[ProductName]"
104 Name="Location"116 Name="Location"
105 Type="raw" />117 Type="raw" />
106 </Property>118 </Property>
107 <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 119 <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" />
108 <InstallUISequence>120 <InstallUISequence>
109 <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 121 <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom>
110 </InstallUISequence>122 </InstallUISequence>
111123
112124
113 <!-- UI -->125 <!-- UI -->
114126
=== modified file 'Percona-Server/packaging/rpm-uln/mysql.spec.sh'
--- Percona-Server/packaging/rpm-uln/mysql.spec.sh 2013-07-09 18:35:26 +0000
+++ Percona-Server/packaging/rpm-uln/mysql.spec.sh 2013-12-05 18:48:48 +0000
@@ -858,7 +858,9 @@
858%files -n mysql-server%{product_suffix} -f release/support-files/plugins.files858%files -n mysql-server%{product_suffix} -f release/support-files/plugins.files
859%defattr(-,root,root)859%defattr(-,root,root)
860%doc release/support-files/*.cnf860%doc release/support-files/*.cnf
861%doc %{_datadir}/info/mysql.info*861%if 0%{?commercial}
862 %doc %{_datadir}/info/mysql.info*
863%endif
862%doc %{src_dir}/Docs/ChangeLog864%doc %{src_dir}/Docs/ChangeLog
863%doc %{src_dir}/Docs/INFO_SRC*865%doc %{src_dir}/Docs/INFO_SRC*
864%doc release/Docs/INFO_BIN*866%doc release/Docs/INFO_BIN*
@@ -981,6 +983,9 @@
981%{_mandir}/man1/mysql_client_test.1*983%{_mandir}/man1/mysql_client_test.1*
982984
983%changelog985%changelog
986* Tue Nov 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
987- Removed non gpl file mysql.info from community packages
988
984* Wed Jul 10 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>989* Wed Jul 10 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
985- Removed directory /usr/share/mysql/solaris/postinstall-solaris to resolve build990- Removed directory /usr/share/mysql/solaris/postinstall-solaris to resolve build
986 error991 error
987992
=== modified file 'Percona-Server/plugin/semisync/semisync_master.cc'
--- Percona-Server/plugin/semisync/semisync_master.cc 2011-09-08 10:10:26 +0000
+++ Percona-Server/plugin/semisync/semisync_master.cc 2013-12-05 18:48:48 +0000
@@ -482,13 +482,17 @@
482 lock();482 lock();
483 rpl_semi_sync_master_clients--;483 rpl_semi_sync_master_clients--;
484484
485 /* If user has chosen not to wait if no semi-sync slave available485 /* Only switch off if semi-sync is enabled and is on */
486 and the last semi-sync slave exits, turn off semi-sync on master486 if (getMasterEnabled() && is_on())
487 immediately.487 {
488 */488 /* If user has chosen not to wait if no semi-sync slave available
489 if (!rpl_semi_sync_master_wait_no_slave &&489 and the last semi-sync slave exits, turn off semi-sync on master
490 rpl_semi_sync_master_clients == 0)490 immediately.
491 switch_off();491 */
492 if (!rpl_semi_sync_master_wait_no_slave &&
493 rpl_semi_sync_master_clients == 0)
494 switch_off();
495 }
492 unlock();496 unlock();
493}497}
494498
@@ -752,7 +756,8 @@
752 At this point, the binlog file and position of this transaction756 At this point, the binlog file and position of this transaction
753 must have been removed from ActiveTranx.757 must have been removed from ActiveTranx.
754 */758 */
755 assert(!active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,759 assert(!getMasterEnabled() ||
760 !active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name,
756 trx_wait_binlog_pos));761 trx_wait_binlog_pos));
757 762
758 /* Update the status counter. */763 /* Update the status counter. */
@@ -893,10 +898,7 @@
893 * target, do not request replies from the slave.898 * target, do not request replies from the slave.
894 */899 */
895 if (!getMasterEnabled() || !is_semi_sync_slave())900 if (!getMasterEnabled() || !is_semi_sync_slave())
896 {
897 sync = false;
898 return 0;901 return 0;
899 }
900902
901 function_enter(kWho);903 function_enter(kWho);
902904
@@ -904,15 +906,12 @@
904906
905 /* This is the real check inside the mutex. */907 /* This is the real check inside the mutex. */
906 if (!getMasterEnabled())908 if (!getMasterEnabled())
907 {909 goto l_end; // sync= false at this point in time
908 sync = false;
909 goto l_end;
910 }
911910
912 if (is_on())911 if (is_on())
913 {912 {
914 /* semi-sync is ON */913 /* semi-sync is ON */
915 sync = false; /* No sync unless a transaction is involved. */914 /* sync= false; No sync unless a transaction is involved. */
916915
917 if (reply_file_name_inited_)916 if (reply_file_name_inited_)
918 {917 {
919918
=== modified file 'Percona-Server/scripts/CMakeLists.txt'
--- Percona-Server/scripts/CMakeLists.txt 2013-02-26 05:35:17 +0000
+++ Percona-Server/scripts/CMakeLists.txt 2013-12-05 18:48:48 +0000
@@ -216,7 +216,6 @@
216 COMPONENT Server216 COMPONENT Server
217 )217 )
218218
219
220SET(prefix "${CMAKE_INSTALL_PREFIX}")219SET(prefix "${CMAKE_INSTALL_PREFIX}")
221SET(sysconfdir ${prefix})220SET(sysconfdir ${prefix})
222SET(bindir ${prefix}/${INSTALL_BINDIR})221SET(bindir ${prefix}/${INSTALL_BINDIR})
223222
=== modified file 'Percona-Server/scripts/mysql_system_tables_data.sql'
--- Percona-Server/scripts/mysql_system_tables_data.sql 2013-02-19 09:06:30 +0000
+++ Percona-Server/scripts/mysql_system_tables_data.sql 2013-12-05 18:48:48 +0000
@@ -24,8 +24,7 @@
24-- Get the hostname, if the hostname has any wildcard character like "_" or "%" 24-- Get the hostname, if the hostname has any wildcard character like "_" or "%"
25-- add escape character in front of wildcard character to convert "_" or "%" to25-- add escape character in front of wildcard character to convert "_" or "%" to
26-- a plain character26-- a plain character
27SET @get_hostname= @@hostname;27SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname;
28SELECT REPLACE((SELECT REPLACE(@get_hostname,'_','\_')),'%','\%') INTO @current_hostname;
2928
3029
31-- Fill "db" table with default grants for anyone to30-- Fill "db" table with default grants for anyone to
@@ -41,11 +40,11 @@
41-- from local machine if "user" table didn't exist before40-- from local machine if "user" table didn't exist before
42CREATE TEMPORARY TABLE tmp_user LIKE user;41CREATE TEMPORARY TABLE tmp_user LIKE user;
43INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');42INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
44REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';43REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE @current_hostname != 'localhost';
45REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');44REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
46REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');45REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
47INSERT INTO tmp_user (host,user) VALUES ('localhost','');46INSERT INTO tmp_user (host,user) VALUES ('localhost','');
48INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';47INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
49INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;48INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
50DROP TABLE tmp_user;49DROP TABLE tmp_user;
5150
5251
=== modified file 'Percona-Server/scripts/mysql_system_tables_fix.sql'
--- Percona-Server/scripts/mysql_system_tables_fix.sql 2011-06-30 15:46:53 +0000
+++ Percona-Server/scripts/mysql_system_tables_fix.sql 2013-12-05 18:48:48 +0000
@@ -652,6 +652,8 @@
652INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0;652INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0;
653DROP TABLE tmp_proxies_priv;653DROP TABLE tmp_proxies_priv;
654654
655# Convering the host name to lower case for existing users
656UPDATE user SET host=LOWER( host ) WHERE LOWER( host ) <> host;
655657
656# Activate the new, possible modified privilege tables658# Activate the new, possible modified privilege tables
657# This should not be needed, but gives us some extra testing that the above659# This should not be needed, but gives us some extra testing that the above
658660
=== modified file 'Percona-Server/sql-common/client.c'
--- Percona-Server/sql-common/client.c 2013-06-26 07:01:13 +0000
+++ Percona-Server/sql-common/client.c 2013-12-05 18:48:48 +0000
@@ -4151,6 +4151,7 @@
4151 mysql->options.methods_to_use= option;4151 mysql->options.methods_to_use= option;
4152 break;4152 break;
4153 case MYSQL_SET_CLIENT_IP:4153 case MYSQL_SET_CLIENT_IP:
4154 my_free(mysql->options.client_ip);
4154 mysql->options.client_ip= my_strdup(arg, MYF(MY_WME));4155 mysql->options.client_ip= my_strdup(arg, MYF(MY_WME));
4155 break;4156 break;
4156 case MYSQL_SECURE_AUTH:4157 case MYSQL_SECURE_AUTH:
41574158
=== modified file 'Percona-Server/sql/filesort.cc'
--- Percona-Server/sql/filesort.cc 2013-06-26 07:01:13 +0000
+++ Percona-Server/sql/filesort.cc 2013-12-05 18:48:48 +0000
@@ -1,4 +1,5 @@
1/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.1/*
2 Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
23
3 This program is free software; you can redistribute it and/or modify4 This program is free software; you can redistribute it and/or modify
4 it under the terms of the GNU General Public License as published by5 it under the terms of the GNU General Public License as published by
@@ -201,7 +202,8 @@
201202
202 {203 {
203 const ulong min_sort_memory=204 const ulong min_sort_memory=
204 max(MIN_SORT_MEMORY, param.sort_length * MERGEBUFF2);205 max(MIN_SORT_MEMORY,
206 ALIGN_SIZE(MERGEBUFF2 * (param.rec_length + sizeof(uchar*))));
205 while (memory_available >= min_sort_memory)207 while (memory_available >= min_sort_memory)
206 {208 {
207 ulong keys= memory_available / (param.rec_length + sizeof(char*));209 ulong keys= memory_available / (param.rec_length + sizeof(char*));
@@ -342,7 +344,10 @@
342 "%s: %s",344 "%s: %s",
343 MYF(ME_ERROR + ME_WAITTANG),345 MYF(ME_ERROR + ME_WAITTANG),
344 ER_THD(thd, ER_FILSORT_ABORT),346 ER_THD(thd, ER_FILSORT_ABORT),
345 kill_errno ? ER(kill_errno) : thd->stmt_da->message());347 kill_errno ? ((kill_errno == THD::KILL_CONNECTION &&
348 !shutdown_in_progress) ? ER(THD::KILL_QUERY) :
349 ER(kill_errno)) :
350 thd->stmt_da->message());
346 351
347 if (global_system_variables.log_warnings > 1)352 if (global_system_variables.log_warnings > 1)
348 {353 {
349354
=== modified file 'Percona-Server/sql/ha_partition.cc'
--- Percona-Server/sql/ha_partition.cc 2013-07-29 06:11:13 +0000
+++ Percona-Server/sql/ha_partition.cc 2013-12-05 18:48:48 +0000
@@ -1337,7 +1337,8 @@
1337int ha_partition::prepare_new_partition(TABLE *tbl,1337int ha_partition::prepare_new_partition(TABLE *tbl,
1338 HA_CREATE_INFO *create_info,1338 HA_CREATE_INFO *create_info,
1339 handler *file, const char *part_name,1339 handler *file, const char *part_name,
1340 partition_element *p_elem)1340 partition_element *p_elem,
1341 uint disable_non_uniq_indexes)
1341{1342{
1342 int error;1343 int error;
1343 DBUG_ENTER("prepare_new_partition");1344 DBUG_ENTER("prepare_new_partition");
@@ -1362,6 +1363,7 @@
1362 if ((error= file->ha_open(tbl, part_name, m_mode, m_open_test_lock)))1363 if ((error= file->ha_open(tbl, part_name, m_mode, m_open_test_lock)))
1363 goto error_open;1364 goto error_open;
1364 DBUG_PRINT("info", ("partition %s opened", part_name));1365 DBUG_PRINT("info", ("partition %s opened", part_name));
1366
1365 /*1367 /*
1366 Note: if you plan to add another call that may return failure,1368 Note: if you plan to add another call that may return failure,
1367 better to do it before external_lock() as cleanup_new_partition()1369 better to do it before external_lock() as cleanup_new_partition()
@@ -1372,6 +1374,9 @@
1372 goto error_external_lock;1374 goto error_external_lock;
1373 DBUG_PRINT("info", ("partition %s external locked", part_name));1375 DBUG_PRINT("info", ("partition %s external locked", part_name));
13741376
1377 if (disable_non_uniq_indexes)
1378 file->ha_disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
1379
1375 DBUG_RETURN(0);1380 DBUG_RETURN(0);
1376error_external_lock:1381error_external_lock:
1377 (void) file->close();1382 (void) file->close();
@@ -1649,6 +1654,14 @@
1649 on them to prepare them for copy phase and also for later close1654 on them to prepare them for copy phase and also for later close
1650 calls1655 calls
1651 */1656 */
1657
1658 /*
1659 Before creating new partitions check whether indexes are disabled
1660 in the partitions.
1661 */
1662
1663 uint disable_non_uniq_indexes = indexes_are_disabled();
1664
1652 i= 0;1665 i= 0;
1653 part_count= 0;1666 part_count= 0;
1654 part_it.rewind();1667 part_it.rewind();
@@ -1683,11 +1696,13 @@
1683 if ((error= prepare_new_partition(table, create_info,1696 if ((error= prepare_new_partition(table, create_info,
1684 new_file_array[part],1697 new_file_array[part],
1685 (const char *)part_name_buff,1698 (const char *)part_name_buff,
1686 sub_elem)))1699 sub_elem,
1700 disable_non_uniq_indexes)))
1687 {1701 {
1688 cleanup_new_partition(part_count);1702 cleanup_new_partition(part_count);
1689 DBUG_RETURN(error);1703 DBUG_RETURN(error);
1690 }1704 }
1705
1691 m_added_file[part_count++]= new_file_array[part];1706 m_added_file[part_count++]= new_file_array[part];
1692 } while (++j < num_subparts);1707 } while (++j < num_subparts);
1693 }1708 }
@@ -1700,11 +1715,13 @@
1700 if ((error= prepare_new_partition(table, create_info,1715 if ((error= prepare_new_partition(table, create_info,
1701 new_file_array[i],1716 new_file_array[i],
1702 (const char *)part_name_buff,1717 (const char *)part_name_buff,
1703 part_elem)))1718 part_elem,
1719 disable_non_uniq_indexes)))
1704 {1720 {
1705 cleanup_new_partition(part_count);1721 cleanup_new_partition(part_count);
1706 DBUG_RETURN(error);1722 DBUG_RETURN(error);
1707 }1723 }
1724
1708 m_added_file[part_count++]= new_file_array[i];1725 m_added_file[part_count++]= new_file_array[i];
1709 }1726 }
1710 }1727 }
17111728
=== modified file 'Percona-Server/sql/ha_partition.h'
--- Percona-Server/sql/ha_partition.h 2013-06-14 05:58:29 +0000
+++ Percona-Server/sql/ha_partition.h 2013-12-05 18:48:48 +0000
@@ -270,7 +270,8 @@
270 void cleanup_new_partition(uint part_count);270 void cleanup_new_partition(uint part_count);
271 int prepare_new_partition(TABLE *table, HA_CREATE_INFO *create_info,271 int prepare_new_partition(TABLE *table, HA_CREATE_INFO *create_info,
272 handler *file, const char *part_name,272 handler *file, const char *part_name,
273 partition_element *p_elem);273 partition_element *p_elem,
274 uint disable_non_uniq_indexes);
274 /*275 /*
275 delete_table, rename_table and create uses very similar logic which276 delete_table, rename_table and create uses very similar logic which
276 is packed into this routine.277 is packed into this routine.
277278
=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc 2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/handler.cc 2013-12-05 18:48:48 +0000
@@ -5135,8 +5135,14 @@
5135 "", 0, "DISABLED", 8) ? 1 : 0;5135 "", 0, "DISABLED", 8) ? 1 : 0;
5136 }5136 }
5137 else5137 else
5138 {
5139 DBUG_EXECUTE_IF("simulate_show_status_failure",
5140 DBUG_SET("+d,simulate_net_write_failure"););
5138 result= db_type->show_status &&5141 result= db_type->show_status &&
5139 db_type->show_status(db_type, thd, stat_print, stat) ? 1 : 0;5142 db_type->show_status(db_type, thd, stat_print, stat) ? 1 : 0;
5143 DBUG_EXECUTE_IF("simulate_show_status_failure",
5144 DBUG_SET("-d,simulate_net_write_failure"););
5145 }
5140 }5146 }
51415147
5142 if (!result)5148 if (!result)
51435149
=== modified file 'Percona-Server/sql/item_strfunc.cc'
--- Percona-Server/sql/item_strfunc.cc 2013-02-26 05:35:17 +0000
+++ Percona-Server/sql/item_strfunc.cc 2013-12-05 18:48:48 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.2 Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
33
4 This program is free software; you can redistribute it and/or modify4 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by5 it under the terms of the GNU General Public License as published by
@@ -2928,7 +2928,9 @@
2928 int to_base= (int) args[2]->val_int();2928 int to_base= (int) args[2]->val_int();
2929 int err;2929 int err;
29302930
2931 // Note that abs(INT_MIN) is undefined.
2931 if (args[0]->null_value || args[1]->null_value || args[2]->null_value ||2932 if (args[0]->null_value || args[1]->null_value || args[2]->null_value ||
2933 from_base == INT_MIN || to_base == INT_MIN ||
2932 abs(to_base) > 36 || abs(to_base) < 2 ||2934 abs(to_base) > 36 || abs(to_base) < 2 ||
2933 abs(from_base) > 36 || abs(from_base) < 2 || !(res->length()))2935 abs(from_base) > 36 || abs(from_base) < 2 || !(res->length()))
2934 {2936 {
29352937
=== modified file 'Percona-Server/sql/item_sum.cc'
--- Percona-Server/sql/item_sum.cc 2013-04-14 02:39:56 +0000
+++ Percona-Server/sql/item_sum.cc 2013-12-05 18:48:48 +0000
@@ -1496,8 +1496,12 @@
14961496
1497bool Item_sum_count::add()1497bool Item_sum_count::add()
1498{1498{
1499 if (!args[0]->maybe_null || !args[0]->is_null())1499 for (uint i=0; i<arg_count; i++)
1500 count++;1500 {
1501 if (args[i]->maybe_null && args[i]->is_null())
1502 return 0;
1503 }
1504 count++;
1501 return 0;1505 return 0;
1502}1506}
15031507
15041508
=== modified file 'Percona-Server/sql/log_event.cc'
--- Percona-Server/sql/log_event.cc 2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/log_event.cc 2013-12-05 18:48:48 +0000
@@ -5511,7 +5511,6 @@
55115511
5512 switch (type) {5512 switch (type) {
5513 case LAST_INSERT_ID_EVENT:5513 case LAST_INSERT_ID_EVENT:
5514 thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 1;
5515 thd->first_successful_insert_id_in_prev_stmt= val;5514 thd->first_successful_insert_id_in_prev_stmt= val;
5516 break;5515 break;
5517 case INSERT_ID_EVENT:5516 case INSERT_ID_EVENT:
55185517
=== modified file 'Percona-Server/sql/net_serv.cc'
--- Percona-Server/sql/net_serv.cc 2013-06-27 15:35:20 +0000
+++ Percona-Server/sql/net_serv.cc 2013-12-05 18:48:48 +0000
@@ -1,4 +1,4 @@
1/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.1/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
22
3 This program is free software; you can redistribute it and/or modify3 This program is free software; you can redistribute it and/or modify
4 it under the terms of the GNU General Public License as published by4 it under the terms of the GNU General Public License as published by
@@ -370,6 +370,12 @@
370370
371 MYSQL_NET_WRITE_START(len);371 MYSQL_NET_WRITE_START(len);
372372
373 DBUG_EXECUTE_IF("simulate_net_write_failure", {
374 my_error(ER_NET_ERROR_ON_WRITE, MYF(0));
375 return 1;
376 };
377 );
378
373 /*379 /*
374 Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH380 Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH
375 length. The last packet is always a packet that is < MAX_PACKET_LENGTH.381 length. The last packet is always a packet that is < MAX_PACKET_LENGTH.
376382
=== modified file 'Percona-Server/sql/opt_range.cc'
--- Percona-Server/sql/opt_range.cc 2013-08-14 03:52:04 +0000
+++ Percona-Server/sql/opt_range.cc 2013-12-05 18:48:48 +0000
@@ -8071,15 +8071,16 @@
8071 {8071 {
8072 KEY *table_key=quick->head->key_info+quick->index;8072 KEY *table_key=quick->head->key_info+quick->index;
8073 flag=EQ_RANGE;8073 flag=EQ_RANGE;
8074 if ((table_key->flags & HA_NOSAME) && key->part == table_key->key_parts-1)8074 if ((table_key->flags & HA_NOSAME) &&
8075 key_tree->part == table_key->key_parts-1)
8075 {8076 {
8076 if (!(table_key->flags & HA_NULL_PART_KEY) ||8077 if ((table_key->flags & HA_NULL_PART_KEY) &&
8077 !null_part_in_key(key,8078 null_part_in_key(key,
8078 param->min_key,8079 param->min_key,
8079 (uint) (tmp_min_key - param->min_key)))8080 (uint) (tmp_min_key - param->min_key)))
8080 flag|= UNIQUE_RANGE;8081 flag|= NULL_RANGE;
8081 else8082 else
8082 flag|= NULL_RANGE;8083 flag|= UNIQUE_RANGE;
8083 }8084 }
8084 }8085 }
8085 }8086 }
@@ -8109,7 +8110,7 @@
8109}8110}
81108111
8111/*8112/*
8112 Return 1 if there is only one range and this uses the whole primary key8113 Return 1 if there is only one range and this uses the whole unique key
8113*/8114*/
81148115
8115bool QUICK_RANGE_SELECT::unique_key_range()8116bool QUICK_RANGE_SELECT::unique_key_range()
81168117
=== modified file 'Percona-Server/sql/set_var.cc'
--- Percona-Server/sql/set_var.cc 2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/set_var.cc 2013-12-05 18:48:48 +0000
@@ -217,7 +217,6 @@
217217
218bool sys_var::check(THD *thd, set_var *var)218bool sys_var::check(THD *thd, set_var *var)
219{219{
220 do_deprecated_warning(thd);
221 if ((var->value && do_check(thd, var))220 if ((var->value && do_check(thd, var))
222 || (on_check && on_check(this, thd, var)))221 || (on_check && on_check(this, thd, var)))
223 {222 {
@@ -599,6 +598,7 @@
599598
600int set_var::check(THD *thd)599int set_var::check(THD *thd)
601{600{
601 var->do_deprecated_warning(thd);
602 if (var->is_readonly())602 if (var->is_readonly())
603 {603 {
604 my_error(ER_INCORRECT_GLOBAL_LOCAL_VAR, MYF(0), var->name.str, "read only");604 my_error(ER_INCORRECT_GLOBAL_LOCAL_VAR, MYF(0), var->name.str, "read only");
605605
=== modified file 'Percona-Server/sql/set_var.h'
--- Percona-Server/sql/set_var.h 2013-06-27 15:35:20 +0000
+++ Percona-Server/sql/set_var.h 2013-12-05 18:48:48 +0000
@@ -151,6 +151,7 @@
151 return (option.id != -1) && (m_parse_flag & parse_flags) &&151 return (option.id != -1) && (m_parse_flag & parse_flags) &&
152 insert_dynamic(array, (uchar*)&option);152 insert_dynamic(array, (uchar*)&option);
153 }153 }
154 void do_deprecated_warning(THD *thd);
154155
155private:156private:
156 virtual bool do_check(THD *thd, set_var *var) = 0;157 virtual bool do_check(THD *thd, set_var *var) = 0;
@@ -164,7 +165,7 @@
164 virtual void global_save_default(THD *thd, set_var *var) = 0;165 virtual void global_save_default(THD *thd, set_var *var) = 0;
165 virtual bool session_update(THD *thd, set_var *var) = 0;166 virtual bool session_update(THD *thd, set_var *var) = 0;
166 virtual bool global_update(THD *thd, set_var *var) = 0;167 virtual bool global_update(THD *thd, set_var *var) = 0;
167 void do_deprecated_warning(THD *thd);168
168protected:169protected:
169 /**170 /**
170 A pointer to a value of the variable for SHOW.171 A pointer to a value of the variable for SHOW.
171172
=== modified file 'Percona-Server/sql/sql_acl.cc'
--- Percona-Server/sql/sql_acl.cc 2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/sql_acl.cc 2013-12-05 18:48:48 +0000
@@ -1818,7 +1818,8 @@
18181818
1819 copy_length= (size_t) (strlen(ip ? ip : "") +1819 copy_length= (size_t) (strlen(ip ? ip : "") +
1820 strlen(user ? user : "") +1820 strlen(user ? user : "") +
1821 strlen(db ? db : ""));1821 strlen(db ? db : "")) + 2; /* Added 2 at the end to avoid
1822 buffer overflow at strmov()*/
1822 /*1823 /*
1823 Make sure that strmov() operations do not result in buffer overflow.1824 Make sure that strmov() operations do not result in buffer overflow.
1824 */1825 */
@@ -5218,7 +5219,8 @@
5218 size_t copy_length;5219 size_t copy_length;
52195220
5220 copy_length= (size_t) (strlen(sctx->priv_user ? sctx->priv_user : "") +5221 copy_length= (size_t) (strlen(sctx->priv_user ? sctx->priv_user : "") +
5221 strlen(db ? db : ""));5222 strlen(db ? db : "")) + 1; /* Added 1 at the end to avoid
5223 buffer overflow at strmov()*/
52225224
5223 /*5225 /*
5224 Make sure that strmov() operations do not result in buffer overflow.5226 Make sure that strmov() operations do not result in buffer overflow.
52255227
=== modified file 'Percona-Server/sql/sql_class.h'
--- Percona-Server/sql/sql_class.h 2013-12-03 05:52:35 +0000
+++ Percona-Server/sql/sql_class.h 2013-12-05 18:48:48 +0000
@@ -3699,11 +3699,13 @@
3699 bool get(TABLE *table);3699 bool get(TABLE *table);
3700 static double get_use_cost(uint *buffer, uint nkeys, uint key_size, 3700 static double get_use_cost(uint *buffer, uint nkeys, uint key_size,
3701 ulonglong max_in_memory_size);3701 ulonglong max_in_memory_size);
3702
3703 // Returns the number of bytes needed in imerge_cost_buf.
3702 inline static int get_cost_calc_buff_size(ulong nkeys, uint key_size, 3704 inline static int get_cost_calc_buff_size(ulong nkeys, uint key_size,
3703 ulonglong max_in_memory_size)3705 ulonglong max_in_memory_size)
3704 {3706 {
3705 register ulonglong max_elems_in_tree=3707 register ulonglong max_elems_in_tree=
3706 (1 + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));3708 (max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));
3707 return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree));3709 return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree));
3708 }3710 }
37093711
37103712
=== modified file 'Percona-Server/sql/sql_lex.cc'
--- Percona-Server/sql/sql_lex.cc 2013-08-02 09:40:55 +0000
+++ Percona-Server/sql/sql_lex.cc 2013-12-05 18:48:48 +0000
@@ -412,6 +412,7 @@
412 lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc;412 lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc;
413 lex->select_lex.group_list.empty();413 lex->select_lex.group_list.empty();
414 lex->select_lex.order_list.empty();414 lex->select_lex.order_list.empty();
415 lex->select_lex.gorder_list.empty();
415 lex->duplicates= DUP_ERROR;416 lex->duplicates= DUP_ERROR;
416 lex->ignore= 0;417 lex->ignore= 0;
417 lex->spname= NULL;418 lex->spname= NULL;
418419
=== modified file 'Percona-Server/sql/sql_partition.cc'
--- Percona-Server/sql/sql_partition.cc 2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/sql_partition.cc 2013-12-05 18:48:48 +0000
@@ -5183,6 +5183,8 @@
5183 }5183 }
5184 else if (alter_info->flags & ALTER_REBUILD_PARTITION)5184 else if (alter_info->flags & ALTER_REBUILD_PARTITION)
5185 {5185 {
5186 set_engine_all_partitions(tab_part_info,
5187 tab_part_info->default_engine_type);
5186 if (set_part_state(alter_info, tab_part_info, PART_CHANGED))5188 if (set_part_state(alter_info, tab_part_info, PART_CHANGED))
5187 {5189 {
5188 my_error(ER_DROP_PARTITION_NON_EXISTENT, MYF(0), "REBUILD");5190 my_error(ER_DROP_PARTITION_NON_EXISTENT, MYF(0), "REBUILD");
51895191
=== modified file 'Percona-Server/sql/sql_prepare.cc'
--- Percona-Server/sql/sql_prepare.cc 2013-10-22 13:33:14 +0000
+++ Percona-Server/sql/sql_prepare.cc 2013-12-05 18:48:48 +0000
@@ -880,7 +880,7 @@
880 if (param->state == Item_param::NO_VALUE)880 if (param->state == Item_param::NO_VALUE)
881 DBUG_RETURN(1);881 DBUG_RETURN(1);
882882
883 if (param->limit_clause_param && param->item_type != Item::INT_ITEM)883 if (param->limit_clause_param && param->state != Item_param::INT_VALUE)
884 {884 {
885 param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS);885 param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS);
886 param->item_type= Item::INT_ITEM;886 param->item_type= Item::INT_ITEM;
887887
=== modified file 'Percona-Server/sql/sys_vars.cc'
--- Percona-Server/sql/sys_vars.cc 2013-12-03 05:52:35 +0000
+++ Percona-Server/sql/sys_vars.cc 2013-12-05 18:48:48 +0000
@@ -1,4 +1,4 @@
1/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.1/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
22
3 This program is free software; you can redistribute it and/or modify3 This program is free software; you can redistribute it and/or modify
4 it under the terms of the GNU General Public License as published by4 it under the terms of the GNU General Public License as published by
@@ -1879,9 +1879,13 @@
1879static Sys_var_ulong Sys_thread_concurrency(1879static Sys_var_ulong Sys_thread_concurrency(
1880 "thread_concurrency",1880 "thread_concurrency",
1881 "Permits the application to give the threads system a hint for "1881 "Permits the application to give the threads system a hint for "
1882 "the desired number of threads that should be run at the same time",1882 "the desired number of threads that should be run at the same time."
1883 "This variable has no effect, and is deprecated. "
1884 "It will be removed in a future release.",
1883 READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),1885 READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),
1884 VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1));1886 VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1),
1887 NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
1888 DEPRECATED(""));
18851889
1886static Sys_var_ulong Sys_thread_stack(1890static Sys_var_ulong Sys_thread_stack(
1887 "thread_stack", "The stack size for each thread",1891 "thread_stack", "The stack size for each thread",
18881892
=== modified file 'Percona-Server/storage/innobase/btr/btr0cur.c'
--- Percona-Server/storage/innobase/btr/btr0cur.c 2013-10-22 13:33:14 +0000
+++ Percona-Server/storage/innobase/btr/btr0cur.c 2013-12-05 18:48:48 +0000
@@ -61,6 +61,7 @@
61#include "row0upd.h"61#include "row0upd.h"
62#include "trx0rec.h"62#include "trx0rec.h"
63#include "trx0roll.h" /* trx_is_recv() */63#include "trx0roll.h" /* trx_is_recv() */
64#include "trx0undo.h"
64#include "que0que.h"65#include "que0que.h"
65#include "row0row.h"66#include "row0row.h"
66#include "srv0srv.h"67#include "srv0srv.h"
@@ -1757,7 +1758,7 @@
17571758
1758/***********************************************************//**1759/***********************************************************//**
1759Writes a redo log record of updating a record in-place. */1760Writes a redo log record of updating a record in-place. */
1760UNIV_INLINE1761UNIV_INTERN
1761void1762void
1762btr_cur_update_in_place_log(1763btr_cur_update_in_place_log(
1763/*========================*/1764/*========================*/
@@ -1785,18 +1786,30 @@
1785 return;1786 return;
1786 }1787 }
17871788
1788 /* The code below assumes index is a clustered index: change index to1789 /* For secondary indexes, we could skip writing the dummy system fields
1789 the clustered index if we are updating a secondary index record (or we1790 to the redo log but we have to change redo log parsing of
1790 could as well skip writing the sys col values to the log in this case1791 MLOG_REC_UPDATE_IN_PLACE/MLOG_COMP_REC_UPDATE_IN_PLACE or we have to add
1791 because they are not needed for a secondary index record update) */1792 new redo log record. For now, just write dummy sys fields to the redo
17921793 log if we are updating a secondary index record.
1793 index = dict_table_get_first_index(index->table);1794 */
17941795
1795 mach_write_to_1(log_ptr, flags);1796 mach_write_to_1(log_ptr, flags);
1796 log_ptr++;1797 log_ptr++;
17971798
1798 log_ptr = row_upd_write_sys_vals_to_log(index, trx, roll_ptr, log_ptr,1799 if (dict_index_is_clust(index)) {
1799 mtr);1800 log_ptr = row_upd_write_sys_vals_to_log(
1801 index, trx, roll_ptr, log_ptr, mtr);
1802 } else {
1803 /* Dummy system fields for a secondary index */
1804 /* TRX_ID Position */
1805 log_ptr += mach_write_compressed(log_ptr, 0);
1806 /* ROLL_PTR */
1807 trx_write_roll_ptr(log_ptr, 0);
1808 log_ptr += DATA_ROLL_PTR_LEN;
1809 /* TRX_ID */
1810 log_ptr += mach_ull_write_compressed(log_ptr, 0);
1811 }
1812
1800 mach_write_to_2(log_ptr, page_offset(rec));1813 mach_write_to_2(log_ptr, page_offset(rec));
1801 log_ptr += 2;1814 log_ptr += 2;
18021815
18031816
=== modified file 'Percona-Server/storage/innobase/btr/btr0pcur.c'
--- Percona-Server/storage/innobase/btr/btr0pcur.c 2013-08-14 03:52:04 +0000
+++ Percona-Server/storage/innobase/btr/btr0pcur.c 2013-12-05 18:48:48 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
22
3Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.3Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
44
5This program is free software; you can redistribute it and/or modify it under5This program is free software; you can redistribute it and/or modify it under
6the terms of the GNU General Public License as published by the Free Software6the terms of the GNU General Public License as published by the Free Software
@@ -111,7 +111,7 @@
111 page_t* page;111 page_t* page;
112 ulint offs;112 ulint offs;
113113
114 ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);114 ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
115 ut_ad(cursor->latch_mode != BTR_NO_LATCHES);115 ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
116116
117 block = btr_pcur_get_block(cursor);117 block = btr_pcur_get_block(cursor);
@@ -128,7 +128,6 @@
128128
129 ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX)129 ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX)
130 || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));130 || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
131 ut_a(cursor->latch_mode != BTR_NO_LATCHES);
132131
133 if (UNIV_UNLIKELY(page_get_n_recs(page) == 0)) {132 if (UNIV_UNLIKELY(page_get_n_recs(page) == 0)) {
134 /* It must be an empty index tree; NOTE that in this case133 /* It must be an empty index tree; NOTE that in this case
@@ -239,21 +238,12 @@
239238
240 ut_ad(mtr);239 ut_ad(mtr);
241 ut_ad(mtr->state == MTR_ACTIVE);240 ut_ad(mtr->state == MTR_ACTIVE);
241 ut_ad(cursor->old_stored == BTR_PCUR_OLD_STORED);
242 ut_ad(cursor->pos_state == BTR_PCUR_WAS_POSITIONED
243 || cursor->pos_state == BTR_PCUR_IS_POSITIONED);
242244
243 index = btr_cur_get_index(btr_pcur_get_btr_cur(cursor));245 index = btr_cur_get_index(btr_pcur_get_btr_cur(cursor));
244246
245 if (UNIV_UNLIKELY(cursor->old_stored != BTR_PCUR_OLD_STORED)
246 || UNIV_UNLIKELY(cursor->pos_state != BTR_PCUR_WAS_POSITIONED
247 && cursor->pos_state != BTR_PCUR_IS_POSITIONED)) {
248 ut_print_buf(stderr, cursor, sizeof(btr_pcur_t));
249 putc('\n', stderr);
250 if (cursor->trx_if_known) {
251 trx_print(stderr, cursor->trx_if_known, 0);
252 }
253
254 ut_error;
255 }
256
257 if (UNIV_UNLIKELY247 if (UNIV_UNLIKELY
258 (cursor->rel_pos == BTR_PCUR_AFTER_LAST_IN_TREE248 (cursor->rel_pos == BTR_PCUR_AFTER_LAST_IN_TREE
259 || cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE)) {249 || cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE)) {
@@ -277,14 +267,14 @@
277267
278 if (UNIV_LIKELY(latch_mode == BTR_SEARCH_LEAF)268 if (UNIV_LIKELY(latch_mode == BTR_SEARCH_LEAF)
279 || UNIV_LIKELY(latch_mode == BTR_MODIFY_LEAF)) {269 || UNIV_LIKELY(latch_mode == BTR_MODIFY_LEAF)) {
280 /* Try optimistic restoration */270 /* Try optimistic restoration. */
281271
282 if (UNIV_LIKELY(buf_page_optimistic_get(272 if (buf_page_optimistic_get(latch_mode,
283 latch_mode,273 cursor->block_when_stored,
284 cursor->block_when_stored,274 cursor->modify_clock,
285 cursor->modify_clock,275 file, line, mtr)) {
286 file, line, mtr))) {
287 cursor->pos_state = BTR_PCUR_IS_POSITIONED;276 cursor->pos_state = BTR_PCUR_IS_POSITIONED;
277 cursor->latch_mode = latch_mode;
288278
289 buf_block_dbg_add_level(279 buf_block_dbg_add_level(
290 btr_pcur_get_block(cursor),280 btr_pcur_get_block(cursor),
@@ -296,9 +286,6 @@
296 const rec_t* rec;286 const rec_t* rec;
297 const ulint* offsets1;287 const ulint* offsets1;
298 const ulint* offsets2;288 const ulint* offsets2;
299#endif /* UNIV_DEBUG */
300 cursor->latch_mode = latch_mode;
301#ifdef UNIV_DEBUG
302 rec = btr_pcur_get_rec(cursor);289 rec = btr_pcur_get_rec(cursor);
303290
304 heap = mem_heap_create(256);291 heap = mem_heap_create(256);
@@ -316,7 +303,13 @@
316#endif /* UNIV_DEBUG */303#endif /* UNIV_DEBUG */
317 return(TRUE);304 return(TRUE);
318 }305 }
319306 /* This is the same record as stored,
307 may need to be adjusted for BTR_PCUR_BEFORE/AFTER,
308 depending on search mode and direction. */
309 if (btr_pcur_is_on_user_rec(cursor)) {
310 cursor->pos_state
311 = BTR_PCUR_IS_POSITIONED_OPTIMISTIC;
312 }
320 return(FALSE);313 return(FALSE);
321 }314 }
322 }315 }
@@ -418,7 +411,7 @@
418 buf_block_t* next_block;411 buf_block_t* next_block;
419 page_t* next_page;412 page_t* next_page;
420413
421 ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);414 ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
422 ut_ad(cursor->latch_mode != BTR_NO_LATCHES);415 ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
423 ut_ad(btr_pcur_is_after_last_on_page(cursor));416 ut_ad(btr_pcur_is_after_last_on_page(cursor));
424417
@@ -484,7 +477,6 @@
484 ulint latch_mode;477 ulint latch_mode;
485 ulint latch_mode2;478 ulint latch_mode2;
486479
487 ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
488 ut_ad(cursor->latch_mode != BTR_NO_LATCHES);480 ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
489 ut_ad(btr_pcur_is_before_first_on_page(cursor));481 ut_ad(btr_pcur_is_before_first_on_page(cursor));
490 ut_ad(!btr_pcur_is_before_first_in_tree(cursor, mtr));482 ut_ad(!btr_pcur_is_before_first_in_tree(cursor, mtr));
491483
=== modified file 'Percona-Server/storage/innobase/dict/dict0dict.c'
--- Percona-Server/storage/innobase/dict/dict0dict.c 2013-09-06 13:24:59 +0000
+++ Percona-Server/storage/innobase/dict/dict0dict.c 2013-12-05 18:48:48 +0000
@@ -36,6 +36,11 @@
36/** dummy index for ROW_FORMAT=COMPACT supremum and infimum records */36/** dummy index for ROW_FORMAT=COMPACT supremum and infimum records */
37UNIV_INTERN dict_index_t* dict_ind_compact;37UNIV_INTERN dict_index_t* dict_ind_compact;
3838
39#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
40/** Flag to control insert buffer debugging. */
41UNIV_INTERN uint ibuf_debug;
42#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
43
39#ifndef UNIV_HOTBACKUP44#ifndef UNIV_HOTBACKUP
40#include "buf0buf.h"45#include "buf0buf.h"
41#include "data0type.h"46#include "data0type.h"
@@ -4855,6 +4860,8 @@
4855 dict_index_t* index;4860 dict_index_t* index;
4856 ulint sum_of_index_sizes = 0;4861 ulint sum_of_index_sizes = 0;
48574862
4863 DBUG_EXECUTE_IF("skip_innodb_statistics", return;);
4864
4858 if (table->ibd_file_missing) {4865 if (table->ibd_file_missing) {
4859 ut_print_timestamp(stderr);4866 ut_print_timestamp(stderr);
4860 fprintf(stderr,4867 fprintf(stderr,
@@ -4916,6 +4923,12 @@
4916 continue;4923 continue;
4917 }4924 }
49184925
4926#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
4927 if (ibuf_debug && !dict_index_is_clust(index)) {
4928 goto fake_statistics;
4929 }
4930#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
4931
4919 if (UNIV_LIKELY4932 if (UNIV_LIKELY
4920 (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE4933 (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE
4921 || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO4934 || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO
49224935
=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.c'
--- Percona-Server/storage/innobase/fil/fil0fil.c 2013-12-03 05:53:09 +0000
+++ Percona-Server/storage/innobase/fil/fil0fil.c 2013-12-05 18:48:48 +0000
@@ -4369,7 +4369,7 @@
43694369
4370 if (check_msg) {4370 if (check_msg) {
4371 fprintf(stderr,4371 fprintf(stderr,
4372 "InnoDB: Error: %s in file %s",4372 "InnoDB: Error: %s in file %s\n",
4373 check_msg, filepath);4373 check_msg, filepath);
4374 goto func_exit;4374 goto func_exit;
4375 }4375 }
43764376
=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-10-23 08:23:08 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-12-05 18:48:48 +0000
@@ -55,6 +55,7 @@
55#include <mysql/innodb_priv.h>55#include <mysql/innodb_priv.h>
56#include <mysql/psi/psi.h>56#include <mysql/psi/psi.h>
57#include <my_sys.h>57#include <my_sys.h>
58#include <my_check_opt.h>
5859
59#ifdef MYSQL_SERVER60#ifdef MYSQL_SERVER
60#include <rpl_mi.h>61#include <rpl_mi.h>
@@ -8810,6 +8811,10 @@
8810 /* There exists possibility of not being able to find requested8811 /* There exists possibility of not being able to find requested
8811 index due to inconsistency between MySQL and InoDB dictionary info.8812 index due to inconsistency between MySQL and InoDB dictionary info.
8812 Necessary message should have been printed in innobase_get_index() */8813 Necessary message should have been printed in innobase_get_index() */
8814 if (prebuilt->table->ibd_file_missing) {
8815 n_rows = HA_POS_ERROR;
8816 goto func_exit;
8817 }
8813 if (UNIV_UNLIKELY(!index)) {8818 if (UNIV_UNLIKELY(!index)) {
8814 n_rows = HA_POS_ERROR;8819 n_rows = HA_POS_ERROR;
8815 goto func_exit;8820 goto func_exit;
@@ -9533,8 +9538,7 @@
9533ha_innobase::check(9538ha_innobase::check(
9534/*===============*/9539/*===============*/
9535 THD* thd, /*!< in: user thread handle */9540 THD* thd, /*!< in: user thread handle */
9536 HA_CHECK_OPT* check_opt) /*!< in: check options, currently9541 HA_CHECK_OPT* check_opt) /*!< in: check options */
9537 ignored */
9538{9542{
9539 dict_index_t* index;9543 dict_index_t* index;
9540 ulint n_rows;9544 ulint n_rows;
@@ -9591,11 +9595,6 @@
9591 do additional check */9595 do additional check */
9592 prebuilt->table->corrupted = FALSE;9596 prebuilt->table->corrupted = FALSE;
95939597
9594 /* Enlarge the fatal lock wait timeout during CHECK TABLE. */
9595 mutex_enter(&kernel_mutex);
9596 srv_fatal_semaphore_wait_threshold += SRV_SEMAPHORE_WAIT_EXTENSION;
9597 mutex_exit(&kernel_mutex);
9598
9599 for (index = dict_table_get_first_index(prebuilt->table);9598 for (index = dict_table_get_first_index(prebuilt->table);
9600 index != NULL;9599 index != NULL;
9601 index = dict_table_get_next_index(index)) {9600 index = dict_table_get_next_index(index)) {
@@ -9608,21 +9607,42 @@
96089607
9609 /* If this is an index being created, break */9608 /* If this is an index being created, break */
9610 if (*index->name == TEMP_INDEX_PREFIX) {9609 if (*index->name == TEMP_INDEX_PREFIX) {
9611 break;
9612 } else if (!btr_validate_index(index, prebuilt->trx)) {
9613 is_ok = FALSE;
9614
9615 innobase_format_name(
9616 index_name, sizeof index_name,
9617 prebuilt->index->name, TRUE);
9618
9619 push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
9620 ER_NOT_KEYFILE,
9621 "InnoDB: The B-tree of"
9622 " index %s is corrupted.",
9623 index_name);
9624 continue;9610 continue;
9625 }9611 }
9612 if (!(check_opt->flags & T_QUICK)) {
9613 /* Enlarge the fatal lock wait timeout during
9614 CHECK TABLE. */
9615 mutex_enter(&kernel_mutex);
9616 srv_fatal_semaphore_wait_threshold +=
9617 SRV_SEMAPHORE_WAIT_EXTENSION;
9618 mutex_exit(&kernel_mutex);
9619
9620 ibool valid = TRUE;
9621 valid = btr_validate_index(index, prebuilt->trx);
9622
9623 /* Restore the fatal lock wait timeout after
9624 CHECK TABLE. */
9625 mutex_enter(&kernel_mutex);
9626 srv_fatal_semaphore_wait_threshold -=
9627 SRV_SEMAPHORE_WAIT_EXTENSION;
9628 mutex_exit(&kernel_mutex);
9629
9630 if (!valid) {
9631 is_ok = FALSE;
9632
9633 innobase_format_name(
9634 index_name, sizeof index_name,
9635 index->name, TRUE);
9636 push_warning_printf(thd,
9637 MYSQL_ERROR::WARN_LEVEL_WARN,
9638 ER_NOT_KEYFILE,
9639 "InnoDB: The B-tree of"
9640 " index %s is corrupted.",
9641 index_name);
9642
9643 continue;
9644 }
9645 }
96269646
9627 /* Instead of invoking change_active_index(), set up9647 /* Instead of invoking change_active_index(), set up
9628 a dummy template for non-locking reads, disabling9648 a dummy template for non-locking reads, disabling
@@ -9725,21 +9745,17 @@
9725 /* Restore the original isolation level */9745 /* Restore the original isolation level */
9726 prebuilt->trx->isolation_level = old_isolation_level;9746 prebuilt->trx->isolation_level = old_isolation_level;
97279747
9728 /* We validate also the whole adaptive hash index for all tables9748#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
9729 at every CHECK TABLE */9749 /* We validate the whole adaptive hash index for all tables
9750 at every CHECK TABLE only when QUICK flag is not present. */
97309751
9731 if (!btr_search_validate()) {9752 if (!(check_opt->flags & T_QUICK) && !btr_search_validate()) {
9732 push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,9753 push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
9733 ER_NOT_KEYFILE,9754 ER_NOT_KEYFILE,
9734 "InnoDB: The adaptive hash index is corrupted.");9755 "InnoDB: The adaptive hash index is corrupted.");
9735 is_ok = FALSE;9756 is_ok = FALSE;
9736 }9757 }
97379758#endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */
9738 /* Restore the fatal lock wait timeout after CHECK TABLE. */
9739 mutex_enter(&kernel_mutex);
9740 srv_fatal_semaphore_wait_threshold -= SRV_SEMAPHORE_WAIT_EXTENSION;
9741 mutex_exit(&kernel_mutex);
9742
9743 prebuilt->trx->op_info = "";9759 prebuilt->trx->op_info = "";
9744 if (thd_killed(user_thd)) {9760 if (thd_killed(user_thd)) {
9745 my_error(ER_QUERY_INTERRUPTED, MYF(0));9761 my_error(ER_QUERY_INTERRUPTED, MYF(0));
@@ -10623,6 +10639,7 @@
10623 const long MAX_STATUS_SIZE = 1048576;10639 const long MAX_STATUS_SIZE = 1048576;
10624 ulint trx_list_start = ULINT_UNDEFINED;10640 ulint trx_list_start = ULINT_UNDEFINED;
10625 ulint trx_list_end = ULINT_UNDEFINED;10641 ulint trx_list_end = ULINT_UNDEFINED;
10642 bool ret_val;
1062610643
10627 DBUG_ENTER("innodb_show_status");10644 DBUG_ENTER("innodb_show_status");
10628 DBUG_ASSERT(hton == innodb_hton_ptr);10645 DBUG_ASSERT(hton == innodb_hton_ptr);
@@ -10687,12 +10704,13 @@
1068710704
10688 mutex_exit(&srv_monitor_file_mutex);10705 mutex_exit(&srv_monitor_file_mutex);
1068910706
10690 stat_print(thd, innobase_hton_name, (uint) strlen(innobase_hton_name),10707 ret_val= stat_print(thd, innobase_hton_name,
10691 STRING_WITH_LEN(""), str, flen);10708 (uint) strlen(innobase_hton_name),
10709 STRING_WITH_LEN(""), str, flen);
1069210710
10693 my_free(str);10711 my_free(str);
1069410712
10695 DBUG_RETURN(FALSE);10713 DBUG_RETURN(ret_val);
10696}10714}
1069710715
10698/************************************************************************//**10716/************************************************************************//**
1069910717
=== modified file 'Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c'
--- Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c 2013-10-22 13:33:14 +0000
+++ Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c 2013-12-05 18:48:48 +0000
@@ -194,11 +194,6 @@
194/** Operations that can currently be buffered. */194/** Operations that can currently be buffered. */
195UNIV_INTERN ibuf_use_t ibuf_use = IBUF_USE_ALL;195UNIV_INTERN ibuf_use_t ibuf_use = IBUF_USE_ALL;
196196
197#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
198/** Flag to control insert buffer debugging. */
199UNIV_INTERN uint ibuf_debug;
200#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
201
202/** The insert buffer control structure */197/** The insert buffer control structure */
203UNIV_INTERN ibuf_t* ibuf = NULL;198UNIV_INTERN ibuf_t* ibuf = NULL;
204199
@@ -2693,6 +2688,12 @@
2693 return(0);2688 return(0);
2694 }2689 }
26952690
2691#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
2692 if (ibuf_debug) {
2693 return(0);
2694 }
2695#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
2696
2696 ibuf_mtr_start(&mtr);2697 ibuf_mtr_start(&mtr);
26972698
2698 /* Open a cursor to a randomly chosen leaf of the tree, at a random2699 /* Open a cursor to a randomly chosen leaf of the tree, at a random
@@ -4066,6 +4067,24 @@
4066 to btr_cur_update_in_place(). */4067 to btr_cur_update_in_place(). */
4067 row_upd_rec_in_place(rec, index, offsets,4068 row_upd_rec_in_place(rec, index, offsets,
4068 update, page_zip);4069 update, page_zip);
4070
4071 /* Log the update in place operation. During recovery
4072 MLOG_COMP_REC_UPDATE_IN_PLACE/MLOG_REC_UPDATE_IN_PLACE
4073 expects trx_id, roll_ptr for secondary indexes. So we
4074 just write dummy trx_id(0), roll_ptr(0) */
4075 btr_cur_update_in_place_log(BTR_KEEP_SYS_FLAG, rec,
4076 index, update,
4077 NULL, 0, mtr);
4078 DBUG_EXECUTE_IF(
4079 "crash_after_log_ibuf_upd_inplace",
4080 log_buffer_flush_to_disk();
4081 fprintf(stderr,
4082 "InnoDB: Wrote log record for ibuf "
4083 "update in place operation\n");
4084 DBUG_SUICIDE();
4085 );
4086
4087
4069 goto updated_in_place;4088 goto updated_in_place;
4070 }4089 }
40714090
40724091
=== modified file 'Percona-Server/storage/innobase/include/btr0cur.h'
--- Percona-Server/storage/innobase/include/btr0cur.h 2013-05-23 08:39:28 +0000
+++ Percona-Server/storage/innobase/include/btr0cur.h 2013-12-05 18:48:48 +0000
@@ -637,6 +637,21 @@
637 uncompressed */637 uncompressed */
638 ibool val, /*!< in: value to set */638 ibool val, /*!< in: value to set */
639 mtr_t* mtr); /*!< in/out: mini-transaction */639 mtr_t* mtr); /*!< in/out: mini-transaction */
640
641/***********************************************************//**
642Writes a redo log record of updating a record in-place. */
643UNIV_INTERN
644void
645btr_cur_update_in_place_log(
646/*========================*/
647 ulint flags, /*!< in: flags */
648 rec_t* rec, /*!< in: record */
649 dict_index_t* index, /*!< in: index where cursor positioned */
650 const upd_t* update, /*!< in: update vector */
651 trx_t* trx, /*!< in: transaction */
652 roll_ptr_t roll_ptr, /*!< in: roll ptr */
653 mtr_t* mtr); /*!< in: mtr */
654
640/*######################################################################*/655/*######################################################################*/
641656
642/** In the pessimistic delete, if the page data size drops below this657/** In the pessimistic delete, if the page data size drops below this
643658
=== modified file 'Percona-Server/storage/innobase/include/btr0pcur.h'
--- Percona-Server/storage/innobase/include/btr0pcur.h 2013-06-10 20:29:41 +0000
+++ Percona-Server/storage/innobase/include/btr0pcur.h 2013-12-05 18:48:48 +0000
@@ -1,6 +1,6 @@
1/*****************************************************************************1/*****************************************************************************
22
3Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved.3Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
44
5This program is free software; you can redistribute it and/or modify it under5This program is free software; you can redistribute it and/or modify it under
6the terms of the GNU General Public License as published by the Free Software6the terms of the GNU General Public License as published by the Free Software
@@ -447,6 +447,27 @@
447/*==========================*/447/*==========================*/
448 btr_pcur_t* cursor);/*!< in/out: persistent cursor */448 btr_pcur_t* cursor);/*!< in/out: persistent cursor */
449449
450/** Position state of persistent B-tree cursor. */
451enum pcur_pos_t {
452 /** The persistent cursor is not positioned. */
453 BTR_PCUR_NOT_POSITIONED = 0,
454 /** The persistent cursor was previously positioned.
455 TODO: currently, the state can be BTR_PCUR_IS_POSITIONED,
456 though it really should be BTR_PCUR_WAS_POSITIONED,
457 because we have no obligation to commit the cursor with
458 mtr; similarly latch_mode may be out of date. This can
459 lead to problems if btr_pcur is not used the right way;
460 all current code should be ok. */
461 BTR_PCUR_WAS_POSITIONED,
462 /** The persistent cursor is positioned by optimistic get to the same
463 record as it was positioned at. Not used for rel_pos == BTR_PCUR_ON.
464 It may need adjustment depending on previous/current search direction
465 and rel_pos. */
466 BTR_PCUR_IS_POSITIONED_OPTIMISTIC,
467 /** The persistent cursor is positioned by index search.
468 Or optimistic get for rel_pos == BTR_PCUR_ON. */
469 BTR_PCUR_IS_POSITIONED
470};
450471
451/* The persistent B-tree cursor structure. This is used mainly for SQL472/* The persistent B-tree cursor structure. This is used mainly for SQL
452selects, updates, and deletes. */473selects, updates, and deletes. */
@@ -480,10 +501,8 @@
480 ib_uint64_t modify_clock; /*!< the modify clock value of the501 ib_uint64_t modify_clock; /*!< the modify clock value of the
481 buffer block when the cursor position502 buffer block when the cursor position
482 was stored */503 was stored */
483 ulint pos_state; /*!< see TODO note below!504 enum pcur_pos_t pos_state; /*!< btr_pcur_store_position() and
484 BTR_PCUR_IS_POSITIONED,505 btr_pcur_restore_position() state. */
485 BTR_PCUR_WAS_POSITIONED,
486 BTR_PCUR_NOT_POSITIONED */
487 ulint search_mode; /*!< PAGE_CUR_G, ... */506 ulint search_mode; /*!< PAGE_CUR_G, ... */
488 trx_t* trx_if_known; /*!< the transaction, if we know it;507 trx_t* trx_if_known; /*!< the transaction, if we know it;
489 otherwise this field is not defined;508 otherwise this field is not defined;
@@ -499,21 +518,6 @@
499 is not NULL */518 is not NULL */
500};519};
501520
502#define BTR_PCUR_IS_POSITIONED 1997660512 /* TODO: currently, the state
503 can be BTR_PCUR_IS_POSITIONED,
504 though it really should be
505 BTR_PCUR_WAS_POSITIONED,
506 because we have no obligation
507 to commit the cursor with
508 mtr; similarly latch_mode may
509 be out of date. This can
510 lead to problems if btr_pcur
511 is not used the right way;
512 all current code should be
513 ok. */
514#define BTR_PCUR_WAS_POSITIONED 1187549791
515#define BTR_PCUR_NOT_POSITIONED 1328997689
516