Merge lp:~laurynas-biveinis/percona-server/merge-5.5.35 into lp:percona-server/5.5
- merge-5.5.35
- Merge into 5.5
Proposed by
Laurynas Biveinis
Status: | Merged |
---|---|
Approved by: | Stewart Smith |
Approved revision: | no longer in the source branch. |
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 |
Related bugs: | |
Related blueprints: |
Merge MySQL 5.5.35
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stewart Smith (community) | Approve | ||
Registry Administrators | Pending | ||
Review via email: mp+197948@code.launchpad.net |
Commit message
Description of the change
Merge MySQL 5.5.35, implementing
https:/
taking upstream fixes for
https:/
https:/
An automerge, except that the upstream fix for
https:/
The upstream fixes for bug 1223196, bug 1049871, bug 1083377 will be
verified and our fixes will be reverted separately.
http://
To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' |
2 | --- Makefile 2013-10-23 08:23:08 +0000 |
3 | +++ Makefile 2013-12-05 18:48:48 +0000 |
4 | @@ -1,4 +1,4 @@ |
5 | -MYSQL_VERSION=5.5.34 |
6 | +MYSQL_VERSION=5.5.35 |
7 | PERCONA_SERVER_VERSION=rel32.0 |
8 | PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION) |
9 | PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION) |
10 | |
11 | === modified file 'Percona-Server/CMakeLists.txt' |
12 | --- Percona-Server/CMakeLists.txt 2013-08-02 09:40:55 +0000 |
13 | +++ Percona-Server/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
14 | @@ -185,7 +185,83 @@ |
15 | ELSE() |
16 | ADD_DEFINITIONS(-DHAVE_RESPONSE_TIME_DISTRIBUTION) |
17 | ENDIF() |
18 | - |
19 | + |
20 | + |
21 | +include(CheckCSourceCompiles) |
22 | +include(CheckCXXSourceCompiles) |
23 | +# We need some extra FAIL_REGEX patterns |
24 | +# Note that CHECK_C_SOURCE_COMPILES is a misnomer, it will also link. |
25 | +MACRO (MY_CHECK_C_COMPILER_FLAG FLAG RESULT) |
26 | + SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") |
27 | + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}") |
28 | + CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${RESULT} |
29 | + FAIL_REGEX "argument unused during compilation" |
30 | + FAIL_REGEX "unsupported .*option" |
31 | + FAIL_REGEX "unknown .*option" |
32 | + FAIL_REGEX "unrecognized .*option" |
33 | + FAIL_REGEX "ignoring unknown option" |
34 | + FAIL_REGEX "[Ww]arning: [Oo]ption" |
35 | + ) |
36 | + SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}") |
37 | +ENDMACRO() |
38 | + |
39 | +MACRO (MY_CHECK_CXX_COMPILER_FLAG FLAG RESULT) |
40 | + SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") |
41 | + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}") |
42 | + CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${RESULT} |
43 | + FAIL_REGEX "argument unused during compilation" |
44 | + FAIL_REGEX "unsupported .*option" |
45 | + FAIL_REGEX "unknown .*option" |
46 | + FAIL_REGEX "unrecognized .*option" |
47 | + FAIL_REGEX "ignoring unknown option" |
48 | + FAIL_REGEX "[Ww]arning: [Oo]ption" |
49 | + ) |
50 | + SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}") |
51 | +ENDMACRO() |
52 | + |
53 | +OPTION(WITH_ASAN "Enable address sanitizer" OFF) |
54 | +IF (WITH_ASAN) |
55 | + # gcc 4.8.1 and new versions of clang |
56 | + MY_CHECK_C_COMPILER_FLAG("-fsanitize=address" HAVE_C_FSANITIZE) |
57 | + MY_CHECK_CXX_COMPILER_FLAG("-fsanitize=address" HAVE_CXX_FSANITIZE) |
58 | + |
59 | + IF(HAVE_C_FSANITIZE AND HAVE_CXX_FSANITIZE) |
60 | + # We switch on basic optimization also for debug builds. |
61 | + # With optimization we may get some warnings, so we switch off -Werror |
62 | + SET(CMAKE_C_FLAGS_DEBUG |
63 | + "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -O1 -Wno-error -fPIC") |
64 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO |
65 | + "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fsanitize=address -fPIC") |
66 | + SET(CMAKE_CXX_FLAGS_DEBUG |
67 | + "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -O1 -Wno-error -fPIC") |
68 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO |
69 | + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fsanitize=address -fPIC") |
70 | + SET(WITH_ASAN_OK 1) |
71 | + ELSE() |
72 | + # older versions of clang |
73 | + MY_CHECK_C_COMPILER_FLAG("-faddress-sanitizer" HAVE_C_FADDRESS) |
74 | + MY_CHECK_CXX_COMPILER_FLAG("-faddress-sanitizer" HAVE_CXX_FFADDRESS) |
75 | + |
76 | + IF(HAVE_C_FADDRESS AND HAVE_CXX_FFADDRESS) |
77 | + # We switch on basic optimization also for debug builds. |
78 | + SET(CMAKE_C_FLAGS_DEBUG |
79 | + "${CMAKE_C_FLAGS_DEBUG} -faddress-sanitizer -O1 -fPIC") |
80 | + SET(CMAKE_C_FLAGS_RELWITHDEBINFO |
81 | + "${CMAKE_C_FLAGS_RELWITHDEBINFO} -faddress-sanitizer -fPIC") |
82 | + SET(CMAKE_CXX_FLAGS_DEBUG |
83 | + "${CMAKE_CXX_FLAGS_DEBUG} -faddress-sanitizer -O1 -fPIC") |
84 | + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO |
85 | + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -faddress-sanitizer -fPIC") |
86 | + SET(WITH_ASAN_OK 1) |
87 | + ENDIF() |
88 | + ENDIF() |
89 | + |
90 | + IF(NOT WITH_ASAN_OK) |
91 | + MESSAGE(FATAL_ERROR "Do not know how to enable address sanitizer") |
92 | + ENDIF() |
93 | +ENDIF() |
94 | + |
95 | + |
96 | OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) |
97 | IF(ENABLE_DEBUG_SYNC) |
98 | SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") |
99 | @@ -386,7 +462,6 @@ |
100 | # (see http://public.kitware.com/Bug/view.php?id=11452) |
101 | SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") |
102 | |
103 | -INCLUDE(CPack) |
104 | IF(UNIX) |
105 | INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) |
106 | ENDIF() |
107 | @@ -401,6 +476,7 @@ |
108 | ) |
109 | INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) |
110 | INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) |
111 | + |
112 | IF(UNIX) |
113 | INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) |
114 | ENDIF() |
115 | @@ -418,3 +494,5 @@ |
116 | PATTERN "sp-imp-spec.txt" EXCLUDE |
117 | ) |
118 | ENDIF() |
119 | + |
120 | +INCLUDE(CPack) |
121 | |
122 | === modified file 'Percona-Server/VERSION' |
123 | --- Percona-Server/VERSION 2013-10-22 13:33:14 +0000 |
124 | +++ Percona-Server/VERSION 2013-12-05 18:48:48 +0000 |
125 | @@ -1,4 +1,4 @@ |
126 | MYSQL_VERSION_MAJOR=5 |
127 | MYSQL_VERSION_MINOR=5 |
128 | -MYSQL_VERSION_PATCH=34 |
129 | +MYSQL_VERSION_PATCH=35 |
130 | MYSQL_VERSION_EXTRA= |
131 | |
132 | === modified file 'Percona-Server/cmake/os/Linux.cmake' |
133 | --- Percona-Server/cmake/os/Linux.cmake 2011-06-30 15:46:53 +0000 |
134 | +++ Percona-Server/cmake/os/Linux.cmake 2013-12-05 18:48:48 +0000 |
135 | @@ -1,5 +1,5 @@ |
136 | |
137 | -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. |
138 | +# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
139 | # |
140 | # This program is free software; you can redistribute it and/or modify |
141 | # it under the terms of the GNU General Public License as published by |
142 | @@ -33,7 +33,10 @@ |
143 | |
144 | # Ensure we have clean build for shared libraries |
145 | # without unresolved symbols |
146 | -SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") |
147 | +# Not supported with AddressSanitizer |
148 | +IF(NOT WITH_ASAN) |
149 | + SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") |
150 | +ENDIF() |
151 | |
152 | # 64 bit file offset support flag |
153 | SET(_FILE_OFFSET_BITS 64) |
154 | |
155 | === modified file 'Percona-Server/configure.cmake' |
156 | --- Percona-Server/configure.cmake 2013-06-26 07:01:13 +0000 |
157 | +++ Percona-Server/configure.cmake 2013-12-05 18:48:48 +0000 |
158 | @@ -147,6 +147,10 @@ |
159 | |
160 | SET(CMAKE_REQUIRED_LIBRARIES |
161 | ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT}) |
162 | + # Need explicit pthread for gcc -fsanitize=address |
163 | + IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=") |
164 | + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread) |
165 | + ENDIF() |
166 | |
167 | LIST(LENGTH CMAKE_REQUIRED_LIBRARIES required_libs_length) |
168 | IF(${required_libs_length} GREATER 0) |
169 | |
170 | === modified file 'Percona-Server/extra/yassl/CMakeLists.txt' |
171 | --- Percona-Server/extra/yassl/CMakeLists.txt 2013-02-26 05:35:17 +0000 |
172 | +++ Percona-Server/extra/yassl/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
173 | @@ -37,4 +37,9 @@ |
174 | ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES}) |
175 | RESTRICT_SYMBOL_EXPORTS(yassl) |
176 | |
177 | +INSTALL_DEBUG_SYMBOLS(yassl) |
178 | +IF(MSVC) |
179 | + INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug) |
180 | +ENDIF() |
181 | + |
182 | |
183 | |
184 | === modified file 'Percona-Server/extra/yassl/taocrypt/CMakeLists.txt' |
185 | --- Percona-Server/extra/yassl/taocrypt/CMakeLists.txt 2012-02-13 12:44:54 +0000 |
186 | +++ Percona-Server/extra/yassl/taocrypt/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
187 | @@ -36,3 +36,8 @@ |
188 | ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES}) |
189 | RESTRICT_SYMBOL_EXPORTS(taocrypt) |
190 | |
191 | +INSTALL_DEBUG_SYMBOLS(taocrypt) |
192 | +IF(MSVC) |
193 | + INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug) |
194 | +ENDIF() |
195 | + |
196 | |
197 | === added file 'Percona-Server/include/my_check_opt.h' |
198 | --- Percona-Server/include/my_check_opt.h 1970-01-01 00:00:00 +0000 |
199 | +++ Percona-Server/include/my_check_opt.h 2013-12-05 18:48:48 +0000 |
200 | @@ -0,0 +1,69 @@ |
201 | +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
202 | + |
203 | +This program is free software; you can redistribute it and/or modify |
204 | +it under the terms of the GNU General Public License as published by |
205 | +the Free Software Foundation; version 2 of the License. |
206 | + |
207 | +This program is distributed in the hope that it will be useful, |
208 | +but WITHOUT ANY WARRANTY; without even the implied warranty of |
209 | +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
210 | +GNU General Public License for more details. |
211 | + |
212 | +You should have received a copy of the GNU General Public License |
213 | +along with this program; if not, write to the Free Software |
214 | +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ |
215 | + |
216 | +#ifndef _my_check_opt_h |
217 | +#define _my_check_opt_h |
218 | + |
219 | +#ifdef __cplusplus |
220 | +extern "C" { |
221 | +#endif |
222 | + |
223 | +/* |
224 | + All given definitions needed for MyISAM storage engine: |
225 | + myisamchk.c or/and ha_myisam.cc or/and micheck.c |
226 | + Some definitions are needed by the MySQL parser. |
227 | +*/ |
228 | + |
229 | +#define T_AUTO_INC (1UL << 0) |
230 | +#define T_AUTO_REPAIR (1UL << 1) |
231 | +#define T_BACKUP_DATA (1UL << 2) |
232 | +#define T_CALC_CHECKSUM (1UL << 3) |
233 | +#define T_CHECK (1UL << 4) |
234 | +#define T_CHECK_ONLY_CHANGED (1UL << 5) |
235 | +#define T_CREATE_MISSING_KEYS (1UL << 6) |
236 | +#define T_DESCRIPT (1UL << 7) |
237 | +#define T_DONT_CHECK_CHECKSUM (1UL << 8) |
238 | +#define T_EXTEND (1UL << 9) |
239 | +#define T_FAST (1UL << 10) |
240 | +#define T_FORCE_CREATE (1UL << 11) |
241 | +#define T_FORCE_UNIQUENESS (1UL << 12) |
242 | +#define T_INFO (1UL << 13) |
243 | +/** CHECK TABLE...MEDIUM (the default) */ |
244 | +#define T_MEDIUM (1UL << 14) |
245 | +/** CHECK TABLE...QUICK */ |
246 | +#define T_QUICK (1UL << 15) |
247 | +#define T_READONLY (1UL << 16) |
248 | +#define T_REP (1UL << 17) |
249 | +#define T_REP_BY_SORT (1UL << 18) |
250 | +#define T_REP_PARALLEL (1UL << 19) |
251 | +#define T_RETRY_WITHOUT_QUICK (1UL << 20) |
252 | +#define T_SAFE_REPAIR (1UL << 21) |
253 | +#define T_SILENT (1UL << 22) |
254 | +#define T_SORT_INDEX (1UL << 23) |
255 | +#define T_SORT_RECORDS (1UL << 24) |
256 | +#define T_STATISTICS (1UL << 25) |
257 | +#define T_UNPACK (1UL << 26) |
258 | +#define T_UPDATE_STATE (1UL << 27) |
259 | +#define T_VERBOSE (1UL << 28) |
260 | +#define T_VERY_SILENT (1UL << 29) |
261 | +#define T_WAIT_FOREVER (1UL << 30) |
262 | +#define T_WRITE_LOOP (1UL << 31) |
263 | + |
264 | +#define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL) |
265 | + |
266 | +#ifdef __cplusplus |
267 | +} |
268 | +#endif |
269 | +#endif |
270 | |
271 | === modified file 'Percona-Server/include/myisam.h' |
272 | --- Percona-Server/include/myisam.h 2012-02-16 09:48:16 +0000 |
273 | +++ Percona-Server/include/myisam.h 2013-12-05 18:48:48 +0000 |
274 | @@ -33,7 +33,7 @@ |
275 | #endif |
276 | #include "my_compare.h" |
277 | #include <mysql/plugin.h> |
278 | - |
279 | +#include <my_check_opt.h> |
280 | /* |
281 | Limit max keys according to HA_MAX_POSSIBLE_KEY |
282 | */ |
283 | @@ -312,51 +312,6 @@ |
284 | #define MYISAMCHK_VERIFY 2 /* Verify, run repair if failure */ |
285 | |
286 | /* |
287 | - Definitions needed for myisamchk.c |
288 | - |
289 | - Entries marked as "QQ to be removed" are NOT used to |
290 | - pass check/repair options to mi_check.c. They are used |
291 | - internally by myisamchk.c or/and ha_myisam.cc and should NOT |
292 | - be stored together with other flags. They should be removed |
293 | - from the following list to make addition of new flags possible. |
294 | -*/ |
295 | - |
296 | -#define T_AUTO_INC 1 |
297 | -#define T_AUTO_REPAIR 2 /* QQ to be removed */ |
298 | -#define T_BACKUP_DATA 4 |
299 | -#define T_CALC_CHECKSUM 8 |
300 | -#define T_CHECK 16 /* QQ to be removed */ |
301 | -#define T_CHECK_ONLY_CHANGED 32 /* QQ to be removed */ |
302 | -#define T_CREATE_MISSING_KEYS 64 |
303 | -#define T_DESCRIPT 128 |
304 | -#define T_DONT_CHECK_CHECKSUM 256 |
305 | -#define T_EXTEND 512 |
306 | -#define T_FAST (1L << 10) /* QQ to be removed */ |
307 | -#define T_FORCE_CREATE (1L << 11) /* QQ to be removed */ |
308 | -#define T_FORCE_UNIQUENESS (1L << 12) |
309 | -#define T_INFO (1L << 13) |
310 | -#define T_MEDIUM (1L << 14) |
311 | -#define T_QUICK (1L << 15) /* QQ to be removed */ |
312 | -#define T_READONLY (1L << 16) /* QQ to be removed */ |
313 | -#define T_REP (1L << 17) |
314 | -#define T_REP_BY_SORT (1L << 18) /* QQ to be removed */ |
315 | -#define T_REP_PARALLEL (1L << 19) /* QQ to be removed */ |
316 | -#define T_RETRY_WITHOUT_QUICK (1L << 20) |
317 | -#define T_SAFE_REPAIR (1L << 21) |
318 | -#define T_SILENT (1L << 22) |
319 | -#define T_SORT_INDEX (1L << 23) /* QQ to be removed */ |
320 | -#define T_SORT_RECORDS (1L << 24) /* QQ to be removed */ |
321 | -#define T_STATISTICS (1L << 25) |
322 | -#define T_UNPACK (1L << 26) |
323 | -#define T_UPDATE_STATE (1L << 27) |
324 | -#define T_VERBOSE (1L << 28) |
325 | -#define T_VERY_SILENT (1L << 29) |
326 | -#define T_WAIT_FOREVER (1L << 30) |
327 | -#define T_WRITE_LOOP ((ulong) 1L << 31) |
328 | - |
329 | -#define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL) |
330 | - |
331 | -/* |
332 | Flags used by myisamchk.c or/and ha_myisam.cc that are NOT passed |
333 | to mi_check.c follows: |
334 | */ |
335 | |
336 | === modified file 'Percona-Server/libmysql/CMakeLists.txt' |
337 | --- Percona-Server/libmysql/CMakeLists.txt 2013-02-04 17:07:22 +0000 |
338 | +++ Percona-Server/libmysql/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
339 | @@ -168,8 +168,10 @@ |
340 | MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) |
341 | |
342 | # Visual Studio users need debug static library for debug projects |
343 | +INSTALL_DEBUG_SYMBOLS(clientlib) |
344 | IF(MSVC) |
345 | INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) |
346 | + INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) |
347 | ENDIF() |
348 | |
349 | IF(UNIX) |
350 | |
351 | === modified file 'Percona-Server/libmysql/authentication_win/CMakeLists.txt' |
352 | --- Percona-Server/libmysql/authentication_win/CMakeLists.txt 2011-04-28 19:39:42 +0000 |
353 | +++ Percona-Server/libmysql/authentication_win/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
354 | @@ -31,3 +31,8 @@ |
355 | # In IDE, group headers in a separate folder. |
356 | |
357 | SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$") |
358 | + |
359 | +INSTALL_DEBUG_SYMBOLS(auth_win_client) |
360 | +IF(MSVC) |
361 | + INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug) |
362 | +ENDIF() |
363 | |
364 | === modified file 'Percona-Server/man/comp_err.1' |
365 | --- Percona-Server/man/comp_err.1 2013-10-22 13:33:14 +0000 |
366 | +++ Percona-Server/man/comp_err.1 2013-12-05 18:48:48 +0000 |
367 | @@ -2,12 +2,12 @@ |
368 | .\" Title: \fBcomp_err\fR |
369 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
370 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
371 | -.\" Date: 09/09/2013 |
372 | +.\" Date: 11/04/2013 |
373 | .\" Manual: MySQL Database System |
374 | .\" Source: MySQL 5.5 |
375 | .\" Language: English |
376 | .\" |
377 | -.TH "\FBCOMP_ERR\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
378 | +.TH "\FBCOMP_ERR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
379 | .\" ----------------------------------------------------------------- |
380 | .\" * Define some portability stuff |
381 | .\" ----------------------------------------------------------------- |
382 | |
383 | === modified file 'Percona-Server/man/innochecksum.1' |
384 | --- Percona-Server/man/innochecksum.1 2013-10-22 13:33:14 +0000 |
385 | +++ Percona-Server/man/innochecksum.1 2013-12-05 18:48:48 +0000 |
386 | @@ -2,12 +2,12 @@ |
387 | .\" Title: \fBinnochecksum\fR |
388 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
389 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
390 | -.\" Date: 09/09/2013 |
391 | +.\" Date: 11/04/2013 |
392 | .\" Manual: MySQL Database System |
393 | .\" Source: MySQL 5.5 |
394 | .\" Language: English |
395 | .\" |
396 | -.TH "\FBINNOCHECKSUM\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
397 | +.TH "\FBINNOCHECKSUM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
398 | .\" ----------------------------------------------------------------- |
399 | .\" * Define some portability stuff |
400 | .\" ----------------------------------------------------------------- |
401 | |
402 | === modified file 'Percona-Server/man/msql2mysql.1' |
403 | --- Percona-Server/man/msql2mysql.1 2013-10-22 13:33:14 +0000 |
404 | +++ Percona-Server/man/msql2mysql.1 2013-12-05 18:48:48 +0000 |
405 | @@ -2,12 +2,12 @@ |
406 | .\" Title: \fBmsql2mysql\fR |
407 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
408 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
409 | -.\" Date: 09/09/2013 |
410 | +.\" Date: 11/04/2013 |
411 | .\" Manual: MySQL Database System |
412 | .\" Source: MySQL 5.5 |
413 | .\" Language: English |
414 | .\" |
415 | -.TH "\FBMSQL2MYSQL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
416 | +.TH "\FBMSQL2MYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
417 | .\" ----------------------------------------------------------------- |
418 | .\" * Define some portability stuff |
419 | .\" ----------------------------------------------------------------- |
420 | |
421 | === modified file 'Percona-Server/man/my_print_defaults.1' |
422 | --- Percona-Server/man/my_print_defaults.1 2013-10-22 13:33:14 +0000 |
423 | +++ Percona-Server/man/my_print_defaults.1 2013-12-05 18:48:48 +0000 |
424 | @@ -2,12 +2,12 @@ |
425 | .\" Title: \fBmy_print_defaults\fR |
426 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
427 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
428 | -.\" Date: 09/09/2013 |
429 | +.\" Date: 11/04/2013 |
430 | .\" Manual: MySQL Database System |
431 | .\" Source: MySQL 5.5 |
432 | .\" Language: English |
433 | .\" |
434 | -.TH "\FBMY_PRINT_DEFAULTS" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
435 | +.TH "\FBMY_PRINT_DEFAULTS" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
436 | .\" ----------------------------------------------------------------- |
437 | .\" * Define some portability stuff |
438 | .\" ----------------------------------------------------------------- |
439 | |
440 | === modified file 'Percona-Server/man/myisam_ftdump.1' |
441 | --- Percona-Server/man/myisam_ftdump.1 2013-10-22 13:33:14 +0000 |
442 | +++ Percona-Server/man/myisam_ftdump.1 2013-12-05 18:48:48 +0000 |
443 | @@ -2,12 +2,12 @@ |
444 | .\" Title: \fBmyisam_ftdump\fR |
445 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
446 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
447 | -.\" Date: 09/09/2013 |
448 | +.\" Date: 11/04/2013 |
449 | .\" Manual: MySQL Database System |
450 | .\" Source: MySQL 5.5 |
451 | .\" Language: English |
452 | .\" |
453 | -.TH "\FBMYISAM_FTDUMP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
454 | +.TH "\FBMYISAM_FTDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
455 | .\" ----------------------------------------------------------------- |
456 | .\" * Define some portability stuff |
457 | .\" ----------------------------------------------------------------- |
458 | |
459 | === modified file 'Percona-Server/man/myisamchk.1' |
460 | --- Percona-Server/man/myisamchk.1 2013-10-22 13:33:14 +0000 |
461 | +++ Percona-Server/man/myisamchk.1 2013-12-05 18:48:48 +0000 |
462 | @@ -2,12 +2,12 @@ |
463 | .\" Title: \fBmyisamchk\fR |
464 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
465 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
466 | -.\" Date: 09/09/2013 |
467 | +.\" Date: 11/04/2013 |
468 | .\" Manual: MySQL Database System |
469 | .\" Source: MySQL 5.5 |
470 | .\" Language: English |
471 | .\" |
472 | -.TH "\FBMYISAMCHK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
473 | +.TH "\FBMYISAMCHK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
474 | .\" ----------------------------------------------------------------- |
475 | .\" * Define some portability stuff |
476 | .\" ----------------------------------------------------------------- |
477 | @@ -2098,7 +2098,8 @@ |
478 | \- check data record references index: 3 |
479 | Key: 3: Keyblocks used: 98% Packed: \-14% Max levels: 3 |
480 | Total: Keyblocks used: 98% Packed: 89% |
481 | -\- check records and index references\fI*** LOTS OF ROW NUMBERS DELETED ***\fR |
482 | +\- check records and index references |
483 | +\fI*** LOTS OF ROW NUMBERS DELETED ***\fR |
484 | Records: 306688 M\&.recordlength: 25 Packed: 83% |
485 | Recordspace used: 97% Empty space: 2% Blocks/Record: 1\&.00 |
486 | Record blocks: 306688 Delete blocks: 0 |
487 | |
488 | === modified file 'Percona-Server/man/myisamlog.1' |
489 | --- Percona-Server/man/myisamlog.1 2013-10-22 13:33:14 +0000 |
490 | +++ Percona-Server/man/myisamlog.1 2013-12-05 18:48:48 +0000 |
491 | @@ -2,12 +2,12 @@ |
492 | .\" Title: \fBmyisamlog\fR |
493 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
494 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
495 | -.\" Date: 09/09/2013 |
496 | +.\" Date: 11/04/2013 |
497 | .\" Manual: MySQL Database System |
498 | .\" Source: MySQL 5.5 |
499 | .\" Language: English |
500 | .\" |
501 | -.TH "\FBMYISAMLOG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
502 | +.TH "\FBMYISAMLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
503 | .\" ----------------------------------------------------------------- |
504 | .\" * Define some portability stuff |
505 | .\" ----------------------------------------------------------------- |
506 | |
507 | === modified file 'Percona-Server/man/myisampack.1' |
508 | --- Percona-Server/man/myisampack.1 2013-10-22 13:33:14 +0000 |
509 | +++ Percona-Server/man/myisampack.1 2013-12-05 18:48:48 +0000 |
510 | @@ -2,12 +2,12 @@ |
511 | .\" Title: \fBmyisampack\fR |
512 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
513 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
514 | -.\" Date: 09/09/2013 |
515 | +.\" Date: 11/04/2013 |
516 | .\" Manual: MySQL Database System |
517 | .\" Source: MySQL 5.5 |
518 | .\" Language: English |
519 | .\" |
520 | -.TH "\FBMYISAMPACK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
521 | +.TH "\FBMYISAMPACK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
522 | .\" ----------------------------------------------------------------- |
523 | .\" * Define some portability stuff |
524 | .\" ----------------------------------------------------------------- |
525 | |
526 | === modified file 'Percona-Server/man/mysql-stress-test.pl.1' |
527 | --- Percona-Server/man/mysql-stress-test.pl.1 2013-10-22 13:33:14 +0000 |
528 | +++ Percona-Server/man/mysql-stress-test.pl.1 2013-12-05 18:48:48 +0000 |
529 | @@ -2,12 +2,12 @@ |
530 | .\" Title: \fBmysql-stress-test.pl\fR |
531 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
532 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
533 | -.\" Date: 09/06/2013 |
534 | +.\" Date: 11/04/2013 |
535 | .\" Manual: MySQL Database System |
536 | .\" Source: MySQL |
537 | .\" Language: English |
538 | .\" |
539 | -.TH "\FBMYSQL\-STRESS\-TE" "1" "09/06/2013" "MySQL" "MySQL Database System" |
540 | +.TH "\FBMYSQL\-STRESS\-TE" "1" "11/04/2013" "MySQL" "MySQL Database System" |
541 | .\" ----------------------------------------------------------------- |
542 | .\" * Define some portability stuff |
543 | .\" ----------------------------------------------------------------- |
544 | |
545 | === modified file 'Percona-Server/man/mysql-test-run.pl.1' |
546 | --- Percona-Server/man/mysql-test-run.pl.1 2013-10-22 13:33:14 +0000 |
547 | +++ Percona-Server/man/mysql-test-run.pl.1 2013-12-05 18:48:48 +0000 |
548 | @@ -2,12 +2,12 @@ |
549 | .\" Title: \fBmysql-test-run.pl\fR |
550 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
551 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
552 | -.\" Date: 09/06/2013 |
553 | +.\" Date: 11/04/2013 |
554 | .\" Manual: MySQL Database System |
555 | .\" Source: MySQL |
556 | .\" Language: English |
557 | .\" |
558 | -.TH "\FBMYSQL\-TEST\-RUN\" "1" "09/06/2013" "MySQL" "MySQL Database System" |
559 | +.TH "\FBMYSQL\-TEST\-RUN\" "1" "11/04/2013" "MySQL" "MySQL Database System" |
560 | .\" ----------------------------------------------------------------- |
561 | .\" * Define some portability stuff |
562 | .\" ----------------------------------------------------------------- |
563 | |
564 | === modified file 'Percona-Server/man/mysql.1' |
565 | --- Percona-Server/man/mysql.1 2013-10-22 13:33:14 +0000 |
566 | +++ Percona-Server/man/mysql.1 2013-12-05 18:48:48 +0000 |
567 | @@ -2,12 +2,12 @@ |
568 | .\" Title: \fBmysql\fR |
569 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
570 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
571 | -.\" Date: 09/09/2013 |
572 | +.\" Date: 11/04/2013 |
573 | .\" Manual: MySQL Database System |
574 | .\" Source: MySQL 5.5 |
575 | .\" Language: English |
576 | .\" |
577 | -.TH "\FBMYSQL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
578 | +.TH "\FBMYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
579 | .\" ----------------------------------------------------------------- |
580 | .\" * Define some portability stuff |
581 | .\" ----------------------------------------------------------------- |
582 | |
583 | === modified file 'Percona-Server/man/mysql.server.1' |
584 | --- Percona-Server/man/mysql.server.1 2013-10-22 13:33:14 +0000 |
585 | +++ Percona-Server/man/mysql.server.1 2013-12-05 18:48:48 +0000 |
586 | @@ -2,12 +2,12 @@ |
587 | .\" Title: \fBmysql.server\fR |
588 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
589 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
590 | -.\" Date: 09/09/2013 |
591 | +.\" Date: 11/04/2013 |
592 | .\" Manual: MySQL Database System |
593 | .\" Source: MySQL 5.5 |
594 | .\" Language: English |
595 | .\" |
596 | -.TH "\FBMYSQL\&.SERVER\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
597 | +.TH "\FBMYSQL\&.SERVER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
598 | .\" ----------------------------------------------------------------- |
599 | .\" * Define some portability stuff |
600 | .\" ----------------------------------------------------------------- |
601 | |
602 | === modified file 'Percona-Server/man/mysql_client_test.1' |
603 | --- Percona-Server/man/mysql_client_test.1 2013-10-22 13:33:14 +0000 |
604 | +++ Percona-Server/man/mysql_client_test.1 2013-12-05 18:48:48 +0000 |
605 | @@ -2,12 +2,12 @@ |
606 | .\" Title: \fBmysql_client_test\fR |
607 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
608 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
609 | -.\" Date: 09/06/2013 |
610 | +.\" Date: 11/04/2013 |
611 | .\" Manual: MySQL Database System |
612 | .\" Source: MySQL |
613 | .\" Language: English |
614 | .\" |
615 | -.TH "\FBMYSQL_CLIENT_TEST" "1" "09/06/2013" "MySQL" "MySQL Database System" |
616 | +.TH "\FBMYSQL_CLIENT_TEST" "1" "11/04/2013" "MySQL" "MySQL Database System" |
617 | .\" ----------------------------------------------------------------- |
618 | .\" * Define some portability stuff |
619 | .\" ----------------------------------------------------------------- |
620 | |
621 | === modified file 'Percona-Server/man/mysql_config.1' |
622 | --- Percona-Server/man/mysql_config.1 2013-10-22 13:33:14 +0000 |
623 | +++ Percona-Server/man/mysql_config.1 2013-12-05 18:48:48 +0000 |
624 | @@ -2,12 +2,12 @@ |
625 | .\" Title: \fBmysql_config\fR |
626 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
627 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
628 | -.\" Date: 09/09/2013 |
629 | +.\" Date: 11/04/2013 |
630 | .\" Manual: MySQL Database System |
631 | .\" Source: MySQL 5.5 |
632 | .\" Language: English |
633 | .\" |
634 | -.TH "\FBMYSQL_CONFIG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
635 | +.TH "\FBMYSQL_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
636 | .\" ----------------------------------------------------------------- |
637 | .\" * Define some portability stuff |
638 | .\" ----------------------------------------------------------------- |
639 | |
640 | === modified file 'Percona-Server/man/mysql_convert_table_format.1' |
641 | --- Percona-Server/man/mysql_convert_table_format.1 2013-10-22 13:33:14 +0000 |
642 | +++ Percona-Server/man/mysql_convert_table_format.1 2013-12-05 18:48:48 +0000 |
643 | @@ -2,12 +2,12 @@ |
644 | .\" Title: \fBmysql_convert_table_format\fR |
645 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
646 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
647 | -.\" Date: 09/09/2013 |
648 | +.\" Date: 11/04/2013 |
649 | .\" Manual: MySQL Database System |
650 | .\" Source: MySQL 5.5 |
651 | .\" Language: English |
652 | .\" |
653 | -.TH "\FBMYSQL_CONVERT_TAB" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
654 | +.TH "\FBMYSQL_CONVERT_TAB" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
655 | .\" ----------------------------------------------------------------- |
656 | .\" * Define some portability stuff |
657 | .\" ----------------------------------------------------------------- |
658 | |
659 | === modified file 'Percona-Server/man/mysql_find_rows.1' |
660 | --- Percona-Server/man/mysql_find_rows.1 2013-10-22 13:33:14 +0000 |
661 | +++ Percona-Server/man/mysql_find_rows.1 2013-12-05 18:48:48 +0000 |
662 | @@ -2,12 +2,12 @@ |
663 | .\" Title: \fBmysql_find_rows\fR |
664 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
665 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
666 | -.\" Date: 09/09/2013 |
667 | +.\" Date: 11/04/2013 |
668 | .\" Manual: MySQL Database System |
669 | .\" Source: MySQL 5.5 |
670 | .\" Language: English |
671 | .\" |
672 | -.TH "\FBMYSQL_FIND_ROWS\F" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
673 | +.TH "\FBMYSQL_FIND_ROWS\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
674 | .\" ----------------------------------------------------------------- |
675 | .\" * Define some portability stuff |
676 | .\" ----------------------------------------------------------------- |
677 | |
678 | === modified file 'Percona-Server/man/mysql_fix_extensions.1' |
679 | --- Percona-Server/man/mysql_fix_extensions.1 2013-10-22 13:33:14 +0000 |
680 | +++ Percona-Server/man/mysql_fix_extensions.1 2013-12-05 18:48:48 +0000 |
681 | @@ -2,12 +2,12 @@ |
682 | .\" Title: \fBmysql_fix_extensions\fR |
683 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
684 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
685 | -.\" Date: 09/09/2013 |
686 | +.\" Date: 11/04/2013 |
687 | .\" Manual: MySQL Database System |
688 | .\" Source: MySQL 5.5 |
689 | .\" Language: English |
690 | .\" |
691 | -.TH "\FBMYSQL_FIX_EXTENSI" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
692 | +.TH "\FBMYSQL_FIX_EXTENSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
693 | .\" ----------------------------------------------------------------- |
694 | .\" * Define some portability stuff |
695 | .\" ----------------------------------------------------------------- |
696 | |
697 | === modified file 'Percona-Server/man/mysql_install_db.1' |
698 | --- Percona-Server/man/mysql_install_db.1 2013-10-22 13:33:14 +0000 |
699 | +++ Percona-Server/man/mysql_install_db.1 2013-12-05 18:48:48 +0000 |
700 | @@ -2,12 +2,12 @@ |
701 | .\" Title: \fBmysql_install_db\fR |
702 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
703 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
704 | -.\" Date: 09/09/2013 |
705 | +.\" Date: 11/04/2013 |
706 | .\" Manual: MySQL Database System |
707 | .\" Source: MySQL 5.5 |
708 | .\" Language: English |
709 | .\" |
710 | -.TH "\FBMYSQL_INSTALL_DB\" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
711 | +.TH "\FBMYSQL_INSTALL_DB\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
712 | .\" ----------------------------------------------------------------- |
713 | .\" * Define some portability stuff |
714 | .\" ----------------------------------------------------------------- |
715 | |
716 | === modified file 'Percona-Server/man/mysql_plugin.1' |
717 | --- Percona-Server/man/mysql_plugin.1 2013-10-22 13:33:14 +0000 |
718 | +++ Percona-Server/man/mysql_plugin.1 2013-12-05 18:48:48 +0000 |
719 | @@ -2,12 +2,12 @@ |
720 | .\" Title: \fBmysql_plugin\fR |
721 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
722 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
723 | -.\" Date: 09/09/2013 |
724 | +.\" Date: 11/04/2013 |
725 | .\" Manual: MySQL Database System |
726 | .\" Source: MySQL 5.5 |
727 | .\" Language: English |
728 | .\" |
729 | -.TH "\FBMYSQL_PLUGIN\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
730 | +.TH "\FBMYSQL_PLUGIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
731 | .\" ----------------------------------------------------------------- |
732 | .\" * Define some portability stuff |
733 | .\" ----------------------------------------------------------------- |
734 | |
735 | === modified file 'Percona-Server/man/mysql_secure_installation.1' |
736 | --- Percona-Server/man/mysql_secure_installation.1 2013-10-22 13:33:14 +0000 |
737 | +++ Percona-Server/man/mysql_secure_installation.1 2013-12-05 18:48:48 +0000 |
738 | @@ -2,12 +2,12 @@ |
739 | .\" Title: \fBmysql_secure_installation\fR |
740 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
741 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
742 | -.\" Date: 09/09/2013 |
743 | +.\" Date: 11/04/2013 |
744 | .\" Manual: MySQL Database System |
745 | .\" Source: MySQL 5.5 |
746 | .\" Language: English |
747 | .\" |
748 | -.TH "\FBMYSQL_SECURE_INST" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
749 | +.TH "\FBMYSQL_SECURE_INST" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
750 | .\" ----------------------------------------------------------------- |
751 | .\" * Define some portability stuff |
752 | .\" ----------------------------------------------------------------- |
753 | @@ -106,7 +106,7 @@ |
754 | .RE |
755 | .\} |
756 | .PP |
757 | -The script will prompt you to determine which actions to perform\&. |
758 | +When executed, the script prompts you to determine which actions to perform\&. |
759 | .SH "COPYRIGHT" |
760 | .br |
761 | .PP |
762 | |
763 | === modified file 'Percona-Server/man/mysql_setpermission.1' |
764 | --- Percona-Server/man/mysql_setpermission.1 2013-10-22 13:33:14 +0000 |
765 | +++ Percona-Server/man/mysql_setpermission.1 2013-12-05 18:48:48 +0000 |
766 | @@ -2,12 +2,12 @@ |
767 | .\" Title: \fBmysql_setpermission\fR |
768 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
769 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
770 | -.\" Date: 09/09/2013 |
771 | +.\" Date: 11/04/2013 |
772 | .\" Manual: MySQL Database System |
773 | .\" Source: MySQL 5.5 |
774 | .\" Language: English |
775 | .\" |
776 | -.TH "\FBMYSQL_SETPERMISSI" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
777 | +.TH "\FBMYSQL_SETPERMISSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
778 | .\" ----------------------------------------------------------------- |
779 | .\" * Define some portability stuff |
780 | .\" ----------------------------------------------------------------- |
781 | |
782 | === modified file 'Percona-Server/man/mysql_tzinfo_to_sql.1' |
783 | --- Percona-Server/man/mysql_tzinfo_to_sql.1 2013-10-22 13:33:14 +0000 |
784 | +++ Percona-Server/man/mysql_tzinfo_to_sql.1 2013-12-05 18:48:48 +0000 |
785 | @@ -2,12 +2,12 @@ |
786 | .\" Title: \fBmysql_tzinfo_to_sql\fR |
787 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
788 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
789 | -.\" Date: 09/09/2013 |
790 | +.\" Date: 11/04/2013 |
791 | .\" Manual: MySQL Database System |
792 | .\" Source: MySQL 5.5 |
793 | .\" Language: English |
794 | .\" |
795 | -.TH "\FBMYSQL_TZINFO_TO_S" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
796 | +.TH "\FBMYSQL_TZINFO_TO_S" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
797 | .\" ----------------------------------------------------------------- |
798 | .\" * Define some portability stuff |
799 | .\" ----------------------------------------------------------------- |
800 | |
801 | === modified file 'Percona-Server/man/mysql_upgrade.1' |
802 | --- Percona-Server/man/mysql_upgrade.1 2013-10-22 13:33:14 +0000 |
803 | +++ Percona-Server/man/mysql_upgrade.1 2013-12-05 18:48:48 +0000 |
804 | @@ -2,12 +2,12 @@ |
805 | .\" Title: \fBmysql_upgrade\fR |
806 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
807 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
808 | -.\" Date: 09/09/2013 |
809 | +.\" Date: 11/04/2013 |
810 | .\" Manual: MySQL Database System |
811 | .\" Source: MySQL 5.5 |
812 | .\" Language: English |
813 | .\" |
814 | -.TH "\FBMYSQL_UPGRADE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
815 | +.TH "\FBMYSQL_UPGRADE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
816 | .\" ----------------------------------------------------------------- |
817 | .\" * Define some portability stuff |
818 | .\" ----------------------------------------------------------------- |
819 | |
820 | === modified file 'Percona-Server/man/mysql_waitpid.1' |
821 | --- Percona-Server/man/mysql_waitpid.1 2013-10-22 13:33:14 +0000 |
822 | +++ Percona-Server/man/mysql_waitpid.1 2013-12-05 18:48:48 +0000 |
823 | @@ -2,12 +2,12 @@ |
824 | .\" Title: \fBmysql_waitpid\fR |
825 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
826 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
827 | -.\" Date: 09/09/2013 |
828 | +.\" Date: 11/04/2013 |
829 | .\" Manual: MySQL Database System |
830 | .\" Source: MySQL 5.5 |
831 | .\" Language: English |
832 | .\" |
833 | -.TH "\FBMYSQL_WAITPID\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
834 | +.TH "\FBMYSQL_WAITPID\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
835 | .\" ----------------------------------------------------------------- |
836 | .\" * Define some portability stuff |
837 | .\" ----------------------------------------------------------------- |
838 | |
839 | === modified file 'Percona-Server/man/mysql_zap.1' |
840 | --- Percona-Server/man/mysql_zap.1 2013-10-22 13:33:14 +0000 |
841 | +++ Percona-Server/man/mysql_zap.1 2013-12-05 18:48:48 +0000 |
842 | @@ -2,12 +2,12 @@ |
843 | .\" Title: \fBmysql_zap\fR |
844 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
845 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
846 | -.\" Date: 09/09/2013 |
847 | +.\" Date: 11/04/2013 |
848 | .\" Manual: MySQL Database System |
849 | .\" Source: MySQL 5.5 |
850 | .\" Language: English |
851 | .\" |
852 | -.TH "\FBMYSQL_ZAP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
853 | +.TH "\FBMYSQL_ZAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
854 | .\" ----------------------------------------------------------------- |
855 | .\" * Define some portability stuff |
856 | .\" ----------------------------------------------------------------- |
857 | |
858 | === modified file 'Percona-Server/man/mysqlaccess.1' |
859 | --- Percona-Server/man/mysqlaccess.1 2013-10-22 13:33:14 +0000 |
860 | +++ Percona-Server/man/mysqlaccess.1 2013-12-05 18:48:48 +0000 |
861 | @@ -2,12 +2,12 @@ |
862 | .\" Title: \fBmysqlaccess\fR |
863 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
864 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
865 | -.\" Date: 09/09/2013 |
866 | +.\" Date: 11/04/2013 |
867 | .\" Manual: MySQL Database System |
868 | .\" Source: MySQL 5.5 |
869 | .\" Language: English |
870 | .\" |
871 | -.TH "\FBMYSQLACCESS\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
872 | +.TH "\FBMYSQLACCESS\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
873 | .\" ----------------------------------------------------------------- |
874 | .\" * Define some portability stuff |
875 | .\" ----------------------------------------------------------------- |
876 | |
877 | === modified file 'Percona-Server/man/mysqladmin.1' |
878 | --- Percona-Server/man/mysqladmin.1 2013-10-22 13:33:14 +0000 |
879 | +++ Percona-Server/man/mysqladmin.1 2013-12-05 18:48:48 +0000 |
880 | @@ -2,12 +2,12 @@ |
881 | .\" Title: \fBmysqladmin\fR |
882 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
883 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
884 | -.\" Date: 09/09/2013 |
885 | +.\" Date: 11/04/2013 |
886 | .\" Manual: MySQL Database System |
887 | .\" Source: MySQL 5.5 |
888 | .\" Language: English |
889 | .\" |
890 | -.TH "\FBMYSQLADMIN\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
891 | +.TH "\FBMYSQLADMIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
892 | .\" ----------------------------------------------------------------- |
893 | .\" * Define some portability stuff |
894 | .\" ----------------------------------------------------------------- |
895 | |
896 | === modified file 'Percona-Server/man/mysqlbinlog.1' |
897 | --- Percona-Server/man/mysqlbinlog.1 2013-10-22 13:33:14 +0000 |
898 | +++ Percona-Server/man/mysqlbinlog.1 2013-12-05 18:48:48 +0000 |
899 | @@ -2,12 +2,12 @@ |
900 | .\" Title: \fBmysqlbinlog\fR |
901 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
902 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
903 | -.\" Date: 09/09/2013 |
904 | +.\" Date: 11/04/2013 |
905 | .\" Manual: MySQL Database System |
906 | .\" Source: MySQL 5.5 |
907 | .\" Language: English |
908 | .\" |
909 | -.TH "\FBMYSQLBINLOG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
910 | +.TH "\FBMYSQLBINLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
911 | .\" ----------------------------------------------------------------- |
912 | .\" * Define some portability stuff |
913 | .\" ----------------------------------------------------------------- |
914 | |
915 | === modified file 'Percona-Server/man/mysqlbug.1' |
916 | --- Percona-Server/man/mysqlbug.1 2013-10-22 13:33:14 +0000 |
917 | +++ Percona-Server/man/mysqlbug.1 2013-12-05 18:48:48 +0000 |
918 | @@ -2,12 +2,12 @@ |
919 | .\" Title: \fBmysqlbug\fR |
920 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
921 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
922 | -.\" Date: 09/09/2013 |
923 | +.\" Date: 11/04/2013 |
924 | .\" Manual: MySQL Database System |
925 | .\" Source: MySQL 5.5 |
926 | .\" Language: English |
927 | .\" |
928 | -.TH "\FBMYSQLBUG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
929 | +.TH "\FBMYSQLBUG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
930 | .\" ----------------------------------------------------------------- |
931 | .\" * Define some portability stuff |
932 | .\" ----------------------------------------------------------------- |
933 | |
934 | === modified file 'Percona-Server/man/mysqlcheck.1' |
935 | --- Percona-Server/man/mysqlcheck.1 2013-10-22 13:33:14 +0000 |
936 | +++ Percona-Server/man/mysqlcheck.1 2013-12-05 18:48:48 +0000 |
937 | @@ -2,12 +2,12 @@ |
938 | .\" Title: \fBmysqlcheck\fR |
939 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
940 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
941 | -.\" Date: 09/09/2013 |
942 | +.\" Date: 11/04/2013 |
943 | .\" Manual: MySQL Database System |
944 | .\" Source: MySQL 5.5 |
945 | .\" Language: English |
946 | .\" |
947 | -.TH "\FBMYSQLCHECK\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
948 | +.TH "\FBMYSQLCHECK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
949 | .\" ----------------------------------------------------------------- |
950 | .\" * Define some portability stuff |
951 | .\" ----------------------------------------------------------------- |
952 | |
953 | === modified file 'Percona-Server/man/mysqld.8' |
954 | --- Percona-Server/man/mysqld.8 2013-10-22 13:33:14 +0000 |
955 | +++ Percona-Server/man/mysqld.8 2013-12-05 18:48:48 +0000 |
956 | @@ -2,12 +2,12 @@ |
957 | .\" Title: \fBmysqld\fR |
958 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
959 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
960 | -.\" Date: 09/09/2013 |
961 | +.\" Date: 11/04/2013 |
962 | .\" Manual: MySQL Database System |
963 | .\" Source: MySQL 5.5 |
964 | .\" Language: English |
965 | .\" |
966 | -.TH "\FBMYSQLD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
967 | +.TH "\FBMYSQLD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
968 | .\" ----------------------------------------------------------------- |
969 | .\" * Define some portability stuff |
970 | .\" ----------------------------------------------------------------- |
971 | |
972 | === modified file 'Percona-Server/man/mysqld_multi.1' |
973 | --- Percona-Server/man/mysqld_multi.1 2013-10-22 13:33:14 +0000 |
974 | +++ Percona-Server/man/mysqld_multi.1 2013-12-05 18:48:48 +0000 |
975 | @@ -2,12 +2,12 @@ |
976 | .\" Title: \fBmysqld_multi\fR |
977 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
978 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
979 | -.\" Date: 09/09/2013 |
980 | +.\" Date: 11/04/2013 |
981 | .\" Manual: MySQL Database System |
982 | .\" Source: MySQL 5.5 |
983 | .\" Language: English |
984 | .\" |
985 | -.TH "\FBMYSQLD_MULTI\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
986 | +.TH "\FBMYSQLD_MULTI\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
987 | .\" ----------------------------------------------------------------- |
988 | .\" * Define some portability stuff |
989 | .\" ----------------------------------------------------------------- |
990 | |
991 | === modified file 'Percona-Server/man/mysqld_safe.1' |
992 | --- Percona-Server/man/mysqld_safe.1 2013-10-22 13:33:14 +0000 |
993 | +++ Percona-Server/man/mysqld_safe.1 2013-12-05 18:48:48 +0000 |
994 | @@ -2,12 +2,12 @@ |
995 | .\" Title: \fBmysqld_safe\fR |
996 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
997 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
998 | -.\" Date: 09/09/2013 |
999 | +.\" Date: 11/04/2013 |
1000 | .\" Manual: MySQL Database System |
1001 | .\" Source: MySQL 5.5 |
1002 | .\" Language: English |
1003 | .\" |
1004 | -.TH "\FBMYSQLD_SAFE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1005 | +.TH "\FBMYSQLD_SAFE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1006 | .\" ----------------------------------------------------------------- |
1007 | .\" * Define some portability stuff |
1008 | .\" ----------------------------------------------------------------- |
1009 | @@ -250,7 +250,7 @@ |
1010 | malloc() |
1011 | library\&. Any library can be used by specifying its path name, but there is a shortcut form to enable use of the |
1012 | tcmalloc |
1013 | -library that is shipped with binary MySQL distributions for Linux in MySQL 5\&.5\&. |
1014 | +library 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\&. |
1015 | .sp |
1016 | The |
1017 | \fB\-\-malloc\-lib\fR |
1018 | |
1019 | === modified file 'Percona-Server/man/mysqldump.1' |
1020 | --- Percona-Server/man/mysqldump.1 2013-10-22 13:33:14 +0000 |
1021 | +++ Percona-Server/man/mysqldump.1 2013-12-05 18:48:48 +0000 |
1022 | @@ -2,12 +2,12 @@ |
1023 | .\" Title: \fBmysqldump\fR |
1024 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1025 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1026 | -.\" Date: 09/09/2013 |
1027 | +.\" Date: 11/04/2013 |
1028 | .\" Manual: MySQL Database System |
1029 | .\" Source: MySQL 5.5 |
1030 | .\" Language: English |
1031 | .\" |
1032 | -.TH "\FBMYSQLDUMP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1033 | +.TH "\FBMYSQLDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1034 | .\" ----------------------------------------------------------------- |
1035 | .\" * Define some portability stuff |
1036 | .\" ----------------------------------------------------------------- |
1037 | @@ -105,7 +105,7 @@ |
1038 | backups with minimal disruption; it can also back up tables from |
1039 | MyISAM |
1040 | and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See |
1041 | -\m[blue]\fBMySQL Enterprise Backup User\*(Aqs Guide (Version 3\&.8\&.2)\fR\m[]\&\s-2\u[1]\d\s+2\&. |
1042 | +Section\ \&24.2, \(lqMySQL Enterprise Backup\(rq\&. |
1043 | .RE |
1044 | .sp |
1045 | .RS 4 |
1046 | @@ -2549,12 +2549,6 @@ |
1047 | .PP |
1048 | You 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/. |
1049 | .sp |
1050 | -.SH "NOTES" |
1051 | -.IP " 1." 4 |
1052 | -MySQL Enterprise Backup User's Guide (Version 3.8.2) |
1053 | -.RS 4 |
1054 | -\%http://dev.mysql.com/doc/mysql-enterprise-backup/3.8/en/index.html |
1055 | -.RE |
1056 | .SH "SEE ALSO" |
1057 | For more information, please refer to the MySQL Reference Manual, |
1058 | which may already be installed locally and which is also available |
1059 | |
1060 | === modified file 'Percona-Server/man/mysqldumpslow.1' |
1061 | --- Percona-Server/man/mysqldumpslow.1 2013-10-22 13:33:14 +0000 |
1062 | +++ Percona-Server/man/mysqldumpslow.1 2013-12-05 18:48:48 +0000 |
1063 | @@ -2,12 +2,12 @@ |
1064 | .\" Title: \fBmysqldumpslow\fR |
1065 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1066 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1067 | -.\" Date: 09/09/2013 |
1068 | +.\" Date: 11/04/2013 |
1069 | .\" Manual: MySQL Database System |
1070 | .\" Source: MySQL 5.5 |
1071 | .\" Language: English |
1072 | .\" |
1073 | -.TH "\FBMYSQLDUMPSLOW\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1074 | +.TH "\FBMYSQLDUMPSLOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1075 | .\" ----------------------------------------------------------------- |
1076 | .\" * Define some portability stuff |
1077 | .\" ----------------------------------------------------------------- |
1078 | |
1079 | === modified file 'Percona-Server/man/mysqlhotcopy.1' |
1080 | --- Percona-Server/man/mysqlhotcopy.1 2013-10-22 13:33:14 +0000 |
1081 | +++ Percona-Server/man/mysqlhotcopy.1 2013-12-05 18:48:48 +0000 |
1082 | @@ -2,12 +2,12 @@ |
1083 | .\" Title: \fBmysqlhotcopy\fR |
1084 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1085 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1086 | -.\" Date: 09/09/2013 |
1087 | +.\" Date: 11/04/2013 |
1088 | .\" Manual: MySQL Database System |
1089 | .\" Source: MySQL 5.5 |
1090 | .\" Language: English |
1091 | .\" |
1092 | -.TH "\FBMYSQLHOTCOPY\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1093 | +.TH "\FBMYSQLHOTCOPY\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1094 | .\" ----------------------------------------------------------------- |
1095 | .\" * Define some portability stuff |
1096 | .\" ----------------------------------------------------------------- |
1097 | |
1098 | === modified file 'Percona-Server/man/mysqlimport.1' |
1099 | --- Percona-Server/man/mysqlimport.1 2013-10-22 13:33:14 +0000 |
1100 | +++ Percona-Server/man/mysqlimport.1 2013-12-05 18:48:48 +0000 |
1101 | @@ -2,12 +2,12 @@ |
1102 | .\" Title: \fBmysqlimport\fR |
1103 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1104 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1105 | -.\" Date: 09/09/2013 |
1106 | +.\" Date: 11/04/2013 |
1107 | .\" Manual: MySQL Database System |
1108 | .\" Source: MySQL 5.5 |
1109 | .\" Language: English |
1110 | .\" |
1111 | -.TH "\FBMYSQLIMPORT\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1112 | +.TH "\FBMYSQLIMPORT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1113 | .\" ----------------------------------------------------------------- |
1114 | .\" * Define some portability stuff |
1115 | .\" ----------------------------------------------------------------- |
1116 | |
1117 | === modified file 'Percona-Server/man/mysqlshow.1' |
1118 | --- Percona-Server/man/mysqlshow.1 2013-10-22 13:33:14 +0000 |
1119 | +++ Percona-Server/man/mysqlshow.1 2013-12-05 18:48:48 +0000 |
1120 | @@ -2,12 +2,12 @@ |
1121 | .\" Title: \fBmysqlshow\fR |
1122 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1123 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1124 | -.\" Date: 09/09/2013 |
1125 | +.\" Date: 11/04/2013 |
1126 | .\" Manual: MySQL Database System |
1127 | .\" Source: MySQL 5.5 |
1128 | .\" Language: English |
1129 | .\" |
1130 | -.TH "\FBMYSQLSHOW\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1131 | +.TH "\FBMYSQLSHOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1132 | .\" ----------------------------------------------------------------- |
1133 | .\" * Define some portability stuff |
1134 | .\" ----------------------------------------------------------------- |
1135 | |
1136 | === modified file 'Percona-Server/man/mysqlslap.1' |
1137 | --- Percona-Server/man/mysqlslap.1 2013-10-22 13:33:14 +0000 |
1138 | +++ Percona-Server/man/mysqlslap.1 2013-12-05 18:48:48 +0000 |
1139 | @@ -2,12 +2,12 @@ |
1140 | .\" Title: \fBmysqlslap\fR |
1141 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1142 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1143 | -.\" Date: 09/09/2013 |
1144 | +.\" Date: 11/04/2013 |
1145 | .\" Manual: MySQL Database System |
1146 | .\" Source: MySQL 5.5 |
1147 | .\" Language: English |
1148 | .\" |
1149 | -.TH "\FBMYSQLSLAP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1150 | +.TH "\FBMYSQLSLAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1151 | .\" ----------------------------------------------------------------- |
1152 | .\" * Define some portability stuff |
1153 | .\" ----------------------------------------------------------------- |
1154 | |
1155 | === modified file 'Percona-Server/man/mysqltest.1' |
1156 | --- Percona-Server/man/mysqltest.1 2013-10-22 13:33:14 +0000 |
1157 | +++ Percona-Server/man/mysqltest.1 2013-12-05 18:48:48 +0000 |
1158 | @@ -2,12 +2,12 @@ |
1159 | .\" Title: \fBmysqltest\fR |
1160 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1161 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1162 | -.\" Date: 09/06/2013 |
1163 | +.\" Date: 11/04/2013 |
1164 | .\" Manual: MySQL Database System |
1165 | .\" Source: MySQL |
1166 | .\" Language: English |
1167 | .\" |
1168 | -.TH "\FBMYSQLTEST\FR" "1" "09/06/2013" "MySQL" "MySQL Database System" |
1169 | +.TH "\FBMYSQLTEST\FR" "1" "11/04/2013" "MySQL" "MySQL Database System" |
1170 | .\" ----------------------------------------------------------------- |
1171 | .\" * Define some portability stuff |
1172 | .\" ----------------------------------------------------------------- |
1173 | |
1174 | === modified file 'Percona-Server/man/ndb-common-options.1' |
1175 | --- Percona-Server/man/ndb-common-options.1 2013-10-23 08:23:08 +0000 |
1176 | +++ Percona-Server/man/ndb-common-options.1 2013-12-05 18:48:48 +0000 |
1177 | @@ -2,12 +2,12 @@ |
1178 | .\" Title: Options Common to MySQL Cluster Programs |
1179 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1180 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1181 | -.\" Date: 09/09/2013 |
1182 | +.\" Date: 11/04/2013 |
1183 | .\" Manual: MySQL Database System |
1184 | .\" Source: MySQL 5.5 |
1185 | .\" Language: English |
1186 | .\" |
1187 | -.TH "OPTIONS COMMON TO MY" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1188 | +.TH "OPTIONS COMMON TO MY" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1189 | .\" ----------------------------------------------------------------- |
1190 | .\" * Define some portability stuff |
1191 | .\" ----------------------------------------------------------------- |
1192 | |
1193 | === modified file 'Percona-Server/man/ndb_blob_tool.1' |
1194 | --- Percona-Server/man/ndb_blob_tool.1 2013-10-22 13:33:14 +0000 |
1195 | +++ Percona-Server/man/ndb_blob_tool.1 2013-12-05 18:48:48 +0000 |
1196 | @@ -2,12 +2,12 @@ |
1197 | .\" Title: \fBndb_blob_tool\fR |
1198 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1199 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1200 | -.\" Date: 09/09/2013 |
1201 | +.\" Date: 11/04/2013 |
1202 | .\" Manual: MySQL Database System |
1203 | .\" Source: MySQL 5.5 |
1204 | .\" Language: English |
1205 | .\" |
1206 | -.TH "\FBNDB_BLOB_TOOL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1207 | +.TH "\FBNDB_BLOB_TOOL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1208 | .\" ----------------------------------------------------------------- |
1209 | .\" * Define some portability stuff |
1210 | .\" ----------------------------------------------------------------- |
1211 | |
1212 | === modified file 'Percona-Server/man/ndb_config.1' |
1213 | --- Percona-Server/man/ndb_config.1 2013-10-22 13:33:14 +0000 |
1214 | +++ Percona-Server/man/ndb_config.1 2013-12-05 18:48:48 +0000 |
1215 | @@ -2,12 +2,12 @@ |
1216 | .\" Title: \fBndb_config\fR |
1217 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1218 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1219 | -.\" Date: 09/09/2013 |
1220 | +.\" Date: 11/04/2013 |
1221 | .\" Manual: MySQL Database System |
1222 | .\" Source: MySQL 5.5 |
1223 | .\" Language: English |
1224 | .\" |
1225 | -.TH "\FBNDB_CONFIG\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1226 | +.TH "\FBNDB_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1227 | .\" ----------------------------------------------------------------- |
1228 | .\" * Define some portability stuff |
1229 | .\" ----------------------------------------------------------------- |
1230 | @@ -1229,7 +1229,7 @@ |
1231 | .\} |
1232 | .nf |
1233 | shell> \fBndb_config \-\-configinfo \-\-xml\fR |
1234 | -<configvariables protocolversion="1" ndbversionstring="5\&.5\&.33\-ndb\-7\&.2\&.14" |
1235 | +<configvariables protocolversion="1" ndbversionstring="5\&.5\&.34\-ndb\-7\&.2\&.15" |
1236 | ndbversion="458758" ndbversionmajor="7" ndbversionminor="0" |
1237 | ndbversionbuild="6"> |
1238 | <section name="SYSTEM"> |
1239 | |
1240 | === modified file 'Percona-Server/man/ndb_cpcd.1' |
1241 | --- Percona-Server/man/ndb_cpcd.1 2013-10-22 13:33:14 +0000 |
1242 | +++ Percona-Server/man/ndb_cpcd.1 2013-12-05 18:48:48 +0000 |
1243 | @@ -2,12 +2,12 @@ |
1244 | .\" Title: \fBndb_cpcd\fR |
1245 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1246 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1247 | -.\" Date: 09/09/2013 |
1248 | +.\" Date: 11/04/2013 |
1249 | .\" Manual: MySQL Database System |
1250 | .\" Source: MySQL 5.5 |
1251 | .\" Language: English |
1252 | .\" |
1253 | -.TH "\FBNDB_CPCD\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1254 | +.TH "\FBNDB_CPCD\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1255 | .\" ----------------------------------------------------------------- |
1256 | .\" * Define some portability stuff |
1257 | .\" ----------------------------------------------------------------- |
1258 | |
1259 | === modified file 'Percona-Server/man/ndb_delete_all.1' |
1260 | --- Percona-Server/man/ndb_delete_all.1 2013-10-22 13:33:14 +0000 |
1261 | +++ Percona-Server/man/ndb_delete_all.1 2013-12-05 18:48:48 +0000 |
1262 | @@ -2,12 +2,12 @@ |
1263 | .\" Title: \fBndb_delete_all\fR |
1264 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1265 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1266 | -.\" Date: 09/09/2013 |
1267 | +.\" Date: 11/04/2013 |
1268 | .\" Manual: MySQL Database System |
1269 | .\" Source: MySQL 5.5 |
1270 | .\" Language: English |
1271 | .\" |
1272 | -.TH "\FBNDB_DELETE_ALL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1273 | +.TH "\FBNDB_DELETE_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1274 | .\" ----------------------------------------------------------------- |
1275 | .\" * Define some portability stuff |
1276 | .\" ----------------------------------------------------------------- |
1277 | |
1278 | === modified file 'Percona-Server/man/ndb_desc.1' |
1279 | --- Percona-Server/man/ndb_desc.1 2013-10-22 13:33:14 +0000 |
1280 | +++ Percona-Server/man/ndb_desc.1 2013-12-05 18:48:48 +0000 |
1281 | @@ -2,12 +2,12 @@ |
1282 | .\" Title: \fBndb_desc\fR |
1283 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1284 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1285 | -.\" Date: 09/09/2013 |
1286 | +.\" Date: 11/04/2013 |
1287 | .\" Manual: MySQL Database System |
1288 | .\" Source: MySQL 5.5 |
1289 | .\" Language: English |
1290 | .\" |
1291 | -.TH "\FBNDB_DESC\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1292 | +.TH "\FBNDB_DESC\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1293 | .\" ----------------------------------------------------------------- |
1294 | .\" * Define some portability stuff |
1295 | .\" ----------------------------------------------------------------- |
1296 | |
1297 | === modified file 'Percona-Server/man/ndb_drop_index.1' |
1298 | --- Percona-Server/man/ndb_drop_index.1 2013-10-22 13:33:14 +0000 |
1299 | +++ Percona-Server/man/ndb_drop_index.1 2013-12-05 18:48:48 +0000 |
1300 | @@ -2,12 +2,12 @@ |
1301 | .\" Title: \fBndb_drop_index\fR |
1302 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1303 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1304 | -.\" Date: 09/09/2013 |
1305 | +.\" Date: 11/04/2013 |
1306 | .\" Manual: MySQL Database System |
1307 | .\" Source: MySQL 5.5 |
1308 | .\" Language: English |
1309 | .\" |
1310 | -.TH "\FBNDB_DROP_INDEX\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1311 | +.TH "\FBNDB_DROP_INDEX\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1312 | .\" ----------------------------------------------------------------- |
1313 | .\" * Define some portability stuff |
1314 | .\" ----------------------------------------------------------------- |
1315 | @@ -123,7 +123,7 @@ |
1316 | Reading table information for completion of table and column names |
1317 | You can turn off this feature to get a quicker startup with \-A |
1318 | Welcome to the MySQL monitor\&. Commands end with ; or \eg\&. |
1319 | -Your MySQL connection id is 7 to server version: 5\&.5\&.33\-ndb\-7\&.2\&.14 |
1320 | +Your MySQL connection id is 7 to server version: 5\&.5\&.34\-ndb\-7\&.2\&.15 |
1321 | Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&. |
1322 | mysql> \fBSHOW TABLES;\fR |
1323 | +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ |
1324 | |
1325 | === modified file 'Percona-Server/man/ndb_drop_table.1' |
1326 | --- Percona-Server/man/ndb_drop_table.1 2013-10-22 13:33:14 +0000 |
1327 | +++ Percona-Server/man/ndb_drop_table.1 2013-12-05 18:48:48 +0000 |
1328 | @@ -2,12 +2,12 @@ |
1329 | .\" Title: \fBndb_drop_table\fR |
1330 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1331 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1332 | -.\" Date: 09/09/2013 |
1333 | +.\" Date: 11/04/2013 |
1334 | .\" Manual: MySQL Database System |
1335 | .\" Source: MySQL 5.5 |
1336 | .\" Language: English |
1337 | .\" |
1338 | -.TH "\FBNDB_DROP_TABLE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1339 | +.TH "\FBNDB_DROP_TABLE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1340 | .\" ----------------------------------------------------------------- |
1341 | .\" * Define some portability stuff |
1342 | .\" ----------------------------------------------------------------- |
1343 | |
1344 | === modified file 'Percona-Server/man/ndb_error_reporter.1' |
1345 | --- Percona-Server/man/ndb_error_reporter.1 2013-10-22 13:33:14 +0000 |
1346 | +++ Percona-Server/man/ndb_error_reporter.1 2013-12-05 18:48:48 +0000 |
1347 | @@ -2,12 +2,12 @@ |
1348 | .\" Title: \fBndb_error_reporter\fR |
1349 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1350 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1351 | -.\" Date: 09/09/2013 |
1352 | +.\" Date: 11/04/2013 |
1353 | .\" Manual: MySQL Database System |
1354 | .\" Source: MySQL 5.5 |
1355 | .\" Language: English |
1356 | .\" |
1357 | -.TH "\FBNDB_ERROR_REPORTE" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1358 | +.TH "\FBNDB_ERROR_REPORTE" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1359 | .\" ----------------------------------------------------------------- |
1360 | .\" * Define some portability stuff |
1361 | .\" ----------------------------------------------------------------- |
1362 | @@ -44,6 +44,15 @@ |
1363 | \fBndb_error_reporter\fR\&. Additional descriptions follow the table\&. For options common to most MySQL Cluster programs (including |
1364 | \fBndb_error_reporter\fR), see |
1365 | Options Common to MySQL Cluster Programs(1)\&. |
1366 | +.PP |
1367 | +\fBndb_error_reporter\fR |
1368 | +did not support the |
1369 | +\fB\-\-help\fR |
1370 | +option prior to MySQL Cluster NDB 7\&.2\&.14 (Bug #11756666, Bug #48606)\&. The |
1371 | +\fB\-\-connection\-timeout\fR |
1372 | +\fB\-\-dry\-scp\fR, and |
1373 | +\fB\-\-skip\-nodegroup\fR |
1374 | +options were also added in this release (Bug #16602002)\&. |
1375 | .sp |
1376 | .it 1 an-trap |
1377 | .nr an-no-space-flag 1 |
1378 | @@ -61,9 +70,30 @@ |
1379 | Added / Removed |
1380 | T} |
1381 | .T& |
1382 | +l l l |
1383 | +l l l |
1384 | +l l l |
1385 | l l l. |
1386 | T{ |
1387 | .PP |
1388 | +--connection-timeout=timeout |
1389 | +T}:T{ |
1390 | +Number of seconds to wait when connecting to nodes before timing out\&. |
1391 | +T}:T{ |
1392 | +.PP |
1393 | +ADDED: NDB 7\&.2\&.14 |
1394 | +T} |
1395 | +T{ |
1396 | +.PP |
1397 | +--dry-scp |
1398 | +T}:T{ |
1399 | +Disable scp with remote hosts; used only for testing\&. |
1400 | +T}:T{ |
1401 | +.PP |
1402 | +ADDED: NDB 7\&.2\&.14 |
1403 | +T} |
1404 | +T{ |
1405 | +.PP |
1406 | --fs |
1407 | T}:T{ |
1408 | Include file system data in error report; can use a large amount of disk |
1409 | @@ -72,6 +102,15 @@ |
1410 | .PP |
1411 | All MySQL 5\&.5 based releases |
1412 | T} |
1413 | +T{ |
1414 | +.PP |
1415 | +--skip-nodegroup=nodegroup_id |
1416 | +T}:T{ |
1417 | +Skip all nodes in the node group having this ID\&. |
1418 | +T}:T{ |
1419 | +.PP |
1420 | +ADDED: NDB 7\&.2\&.14 |
1421 | +T} |
1422 | .TE |
1423 | .sp 1 |
1424 | Usage |
1425 | @@ -80,32 +119,191 @@ |
1426 | .RS 4 |
1427 | .\} |
1428 | .nf |
1429 | -ndb_error_reporter \fIpath/to/config\-file\fR [\fIusername\fR] [\-\-fs] |
1430 | +ndb_error_reporter \fIpath/to/config\-file\fR [\fIusername\fR] [\fIoptions\fR] |
1431 | .fi |
1432 | .if n \{\ |
1433 | .RE |
1434 | .\} |
1435 | .PP |
1436 | -This 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 named |
1437 | +This utility is intended for use on a management node host, and requires the path to the management host configuration file (usually named |
1438 | +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\&. |
1439 | +\fBndb_error_reporter\fR |
1440 | +then includes all of these files in archive that is created in the same directory in which it is run\&. The archive is named |
1441 | ndb_error_report_\fIYYYYMMDDHHMMSS\fR\&.tar\&.bz2, where |
1442 | \fIYYYYMMDDHHMMSS\fR |
1443 | is a datetime string\&. |
1444 | .PP |
1445 | -If the |
1446 | +.\" ndb_error_reporter: options |
1447 | +\fBndb_error_reporter\fR |
1448 | +also accepts the options listed here: |
1449 | +.sp |
1450 | +.RS 4 |
1451 | +.ie n \{\ |
1452 | +\h'-04'\(bu\h'+03'\c |
1453 | +.\} |
1454 | +.el \{\ |
1455 | +.sp -1 |
1456 | +.IP \(bu 2.3 |
1457 | +.\} |
1458 | +.\" connection-timeout option (ndb_error_reporter) |
1459 | +\fB\-\-connection\-timeout=\fR\fB\fItimeout\fR\fR |
1460 | +.TS |
1461 | +allbox tab(:); |
1462 | +l l s s |
1463 | +l l s s |
1464 | +l l s s |
1465 | +^ l l s |
1466 | +^ l l s. |
1467 | +T{ |
1468 | +\fBIntroduced\fR |
1469 | +T}:T{ |
1470 | +5\&.5\&.33\-ndb\-7\&.2\&.14 |
1471 | +T} |
1472 | +T{ |
1473 | +\fBCommand\-Line Format\fR |
1474 | +T}:T{ |
1475 | +\-\-connection\-timeout=timeout |
1476 | +T} |
1477 | +T{ |
1478 | +\ \& |
1479 | +T}:T{ |
1480 | +\fBPermitted Values\fR |
1481 | +T} |
1482 | +:T{ |
1483 | +\fBType\fR |
1484 | +T}:T{ |
1485 | +integer |
1486 | +T} |
1487 | +:T{ |
1488 | +\fBDefault\fR |
1489 | +T}:T{ |
1490 | +0 |
1491 | +T} |
1492 | +.TE |
1493 | +.sp 1 |
1494 | +Wait this many seconds when trying to connect to nodes before timing out\&. |
1495 | +.RE |
1496 | +.sp |
1497 | +.RS 4 |
1498 | +.ie n \{\ |
1499 | +\h'-04'\(bu\h'+03'\c |
1500 | +.\} |
1501 | +.el \{\ |
1502 | +.sp -1 |
1503 | +.IP \(bu 2.3 |
1504 | +.\} |
1505 | +.\" dry-scp option (ndb_error_reporter) |
1506 | +\fB\-\-dry\-scp\fR |
1507 | +.TS |
1508 | +allbox tab(:); |
1509 | +l l s s |
1510 | +l l s s |
1511 | +l l s s |
1512 | +^ l l s |
1513 | +^ l l s. |
1514 | +T{ |
1515 | +\fBIntroduced\fR |
1516 | +T}:T{ |
1517 | +5\&.5\&.33\-ndb\-7\&.2\&.14 |
1518 | +T} |
1519 | +T{ |
1520 | +\fBCommand\-Line Format\fR |
1521 | +T}:T{ |
1522 | +\-\-dry\-scp |
1523 | +T} |
1524 | +T{ |
1525 | +\ \& |
1526 | +T}:T{ |
1527 | +\fBPermitted Values\fR |
1528 | +T} |
1529 | +:T{ |
1530 | +\fBType\fR |
1531 | +T}:T{ |
1532 | +boolean |
1533 | +T} |
1534 | +:T{ |
1535 | +\fBDefault\fR |
1536 | +T}:T{ |
1537 | +TRUE |
1538 | +T} |
1539 | +.TE |
1540 | +.sp 1 |
1541 | +Run |
1542 | +\fBndb_error_reporter\fR |
1543 | +without using scp from remote hosts\&. Used for testing only\&. |
1544 | +.RE |
1545 | +.sp |
1546 | +.RS 4 |
1547 | +.ie n \{\ |
1548 | +\h'-04'\(bu\h'+03'\c |
1549 | +.\} |
1550 | +.el \{\ |
1551 | +.sp -1 |
1552 | +.IP \(bu 2.3 |
1553 | +.\} |
1554 | +.\" fs option (ndb_error_reporter) |
1555 | \fB\-\-fs\fR |
1556 | -is 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 do |
1557 | +.TS |
1558 | +allbox tab(:); |
1559 | +l l s s |
1560 | +l l s s |
1561 | +^ l l s |
1562 | +^ l l s. |
1563 | +T{ |
1564 | +\fBCommand\-Line Format\fR |
1565 | +T}:T{ |
1566 | +\-\-fs |
1567 | +T} |
1568 | +T{ |
1569 | +\ \& |
1570 | +T}:T{ |
1571 | +\fBPermitted Values\fR |
1572 | +T} |
1573 | +:T{ |
1574 | +\fBType\fR |
1575 | +T}:T{ |
1576 | +boolean |
1577 | +T} |
1578 | +:T{ |
1579 | +\fBDefault\fR |
1580 | +T}:T{ |
1581 | +FALSE |
1582 | +T} |
1583 | +.TE |
1584 | +.sp 1 |
1585 | +Copy the data node file systems to the management host and include them in the archive\&. |
1586 | +.sp |
1587 | +Because data node file systems can be extremely large, even after being compressed, we ask that you please do |
1588 | \fInot\fR |
1589 | send archives created using this option to Oracle unless you are specifically requested to do so\&. |
1590 | +.RE |
1591 | +.sp |
1592 | +.RS 4 |
1593 | +.ie n \{\ |
1594 | +\h'-04'\(bu\h'+03'\c |
1595 | +.\} |
1596 | +.el \{\ |
1597 | +.sp -1 |
1598 | +.IP \(bu 2.3 |
1599 | +.\} |
1600 | +.\" skip-nodegroup option (ndb_error_reporter) |
1601 | +\fB\-\-skip\-nodegroup=\fR\fB\fInodegroup_id\fR\fR |
1602 | .TS |
1603 | allbox tab(:); |
1604 | l l s s |
1605 | l l s s |
1606 | +l l s s |
1607 | ^ l l s |
1608 | ^ l l s. |
1609 | T{ |
1610 | +\fBIntroduced\fR |
1611 | +T}:T{ |
1612 | +5\&.5\&.33\-ndb\-7\&.2\&.14 |
1613 | +T} |
1614 | +T{ |
1615 | \fBCommand\-Line Format\fR |
1616 | T}:T{ |
1617 | -\-\-fs |
1618 | +\-\-connection\-timeout=timeout |
1619 | T} |
1620 | T{ |
1621 | \ \& |
1622 | @@ -115,15 +313,17 @@ |
1623 | :T{ |
1624 | \fBType\fR |
1625 | T}:T{ |
1626 | -boolean |
1627 | +integer |
1628 | T} |
1629 | :T{ |
1630 | \fBDefault\fR |
1631 | T}:T{ |
1632 | -FALSE |
1633 | +0 |
1634 | T} |
1635 | .TE |
1636 | .sp 1 |
1637 | +Skip all nodes belong to the node group having the supplied node group ID\&. |
1638 | +.RE |
1639 | .SH "COPYRIGHT" |
1640 | .br |
1641 | .PP |
1642 | |
1643 | === modified file 'Percona-Server/man/ndb_index_stat.1' |
1644 | --- Percona-Server/man/ndb_index_stat.1 2013-10-23 08:23:08 +0000 |
1645 | +++ Percona-Server/man/ndb_index_stat.1 2013-12-05 18:48:48 +0000 |
1646 | @@ -2,12 +2,12 @@ |
1647 | .\" Title: \fBndb_index_stat\fR |
1648 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1649 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1650 | -.\" Date: 09/09/2013 |
1651 | +.\" Date: 11/04/2013 |
1652 | .\" Manual: MySQL Database System |
1653 | .\" Source: MySQL 5.5 |
1654 | .\" Language: English |
1655 | .\" |
1656 | -.TH "\FBNDB_INDEX_STAT\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1657 | +.TH "\FBNDB_INDEX_STAT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1658 | .\" ----------------------------------------------------------------- |
1659 | .\" * Define some portability stuff |
1660 | .\" ----------------------------------------------------------------- |
1661 | |
1662 | === modified file 'Percona-Server/man/ndb_mgm.1' |
1663 | --- Percona-Server/man/ndb_mgm.1 2013-10-22 13:33:14 +0000 |
1664 | +++ Percona-Server/man/ndb_mgm.1 2013-12-05 18:48:48 +0000 |
1665 | @@ -2,12 +2,12 @@ |
1666 | .\" Title: \fBndb_mgm\fR |
1667 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1668 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1669 | -.\" Date: 09/09/2013 |
1670 | +.\" Date: 11/04/2013 |
1671 | .\" Manual: MySQL Database System |
1672 | .\" Source: MySQL 5.5 |
1673 | .\" Language: English |
1674 | .\" |
1675 | -.TH "\FBNDB_MGM\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1676 | +.TH "\FBNDB_MGM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1677 | .\" ----------------------------------------------------------------- |
1678 | .\" * Define some portability stuff |
1679 | .\" ----------------------------------------------------------------- |
1680 | |
1681 | === modified file 'Percona-Server/man/ndb_mgmd.8' |
1682 | --- Percona-Server/man/ndb_mgmd.8 2013-10-22 13:33:14 +0000 |
1683 | +++ Percona-Server/man/ndb_mgmd.8 2013-12-05 18:48:48 +0000 |
1684 | @@ -2,12 +2,12 @@ |
1685 | .\" Title: \fBndb_mgmd\fR |
1686 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1687 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1688 | -.\" Date: 09/09/2013 |
1689 | +.\" Date: 11/04/2013 |
1690 | .\" Manual: MySQL Database System |
1691 | .\" Source: MySQL 5.5 |
1692 | .\" Language: English |
1693 | .\" |
1694 | -.TH "\FBNDB_MGMD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1695 | +.TH "\FBNDB_MGMD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1696 | .\" ----------------------------------------------------------------- |
1697 | .\" * Define some portability stuff |
1698 | .\" ----------------------------------------------------------------- |
1699 | @@ -99,7 +99,9 @@ |
1700 | T} |
1701 | T{ |
1702 | .PP |
1703 | ---configdir=directory |
1704 | +--configdir=directory, |
1705 | +.PP |
1706 | +--config-dir=directory |
1707 | T}:T{ |
1708 | Specify the cluster management server\*(Aqs configuration cache directory |
1709 | T}:T{ |
1710 | @@ -216,9 +218,9 @@ |
1711 | T} |
1712 | T{ |
1713 | .PP |
1714 | ---config-cache=value |
1715 | +--config-cache[=TRUE|FALSE] |
1716 | T}:T{ |
1717 | -Enable the management server configuration cache; ON by default\&. |
1718 | +Enable the management server configuration cache; TRUE by default\&. |
1719 | T}:T{ |
1720 | .PP |
1721 | All MySQL 5\&.5 based releases |
1722 | @@ -349,6 +351,7 @@ |
1723 | allbox tab(:); |
1724 | l l s s |
1725 | l l s s |
1726 | +l l s s |
1727 | ^ l l s |
1728 | ^ l l s. |
1729 | T{ |
1730 | @@ -359,6 +362,11 @@ |
1731 | T{ |
1732 | \ \& |
1733 | T}:T{ |
1734 | +\-\-config\-dir=directory |
1735 | +T} |
1736 | +T{ |
1737 | +\ \& |
1738 | +T}:T{ |
1739 | \fBPermitted Values\fR |
1740 | T} |
1741 | :T{ |
1742 | @@ -387,6 +395,35 @@ |
1743 | .IP \(bu 2.3 |
1744 | .\} |
1745 | .\" config-cache option (ndb_mgmd) |
1746 | +\fB\-\-config\-cache\fR |
1747 | +.TS |
1748 | +allbox tab(:); |
1749 | +l l s s |
1750 | +l l s s |
1751 | +^ l l s |
1752 | +^ l l s. |
1753 | +T{ |
1754 | +\fBCommand\-Line Format\fR |
1755 | +T}:T{ |
1756 | +\-\-config\-cache[=TRUE|FALSE] |
1757 | +T} |
1758 | +T{ |
1759 | +\ \& |
1760 | +T}:T{ |
1761 | +\fBPermitted Values\fR |
1762 | +T} |
1763 | +:T{ |
1764 | +\fBType\fR |
1765 | +T}:T{ |
1766 | +boolean |
1767 | +T} |
1768 | +:T{ |
1769 | +\fBDefault\fR |
1770 | +T}:T{ |
1771 | +TRUE |
1772 | +T} |
1773 | +.TE |
1774 | +.sp 1 |
1775 | This option, whose default value is |
1776 | 1 |
1777 | (or |
1778 | |
1779 | === modified file 'Percona-Server/man/ndb_print_backup_file.1' |
1780 | --- Percona-Server/man/ndb_print_backup_file.1 2013-10-22 13:33:14 +0000 |
1781 | +++ Percona-Server/man/ndb_print_backup_file.1 2013-12-05 18:48:48 +0000 |
1782 | @@ -2,12 +2,12 @@ |
1783 | .\" Title: \fBndb_print_backup_file\fR |
1784 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1785 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1786 | -.\" Date: 09/09/2013 |
1787 | +.\" Date: 11/04/2013 |
1788 | .\" Manual: MySQL Database System |
1789 | .\" Source: MySQL 5.5 |
1790 | .\" Language: English |
1791 | .\" |
1792 | -.TH "\FBNDB_PRINT_BACKUP_" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1793 | +.TH "\FBNDB_PRINT_BACKUP_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1794 | .\" ----------------------------------------------------------------- |
1795 | .\" * Define some portability stuff |
1796 | .\" ----------------------------------------------------------------- |
1797 | |
1798 | === modified file 'Percona-Server/man/ndb_print_schema_file.1' |
1799 | --- Percona-Server/man/ndb_print_schema_file.1 2013-10-22 13:33:14 +0000 |
1800 | +++ Percona-Server/man/ndb_print_schema_file.1 2013-12-05 18:48:48 +0000 |
1801 | @@ -2,12 +2,12 @@ |
1802 | .\" Title: \fBndb_print_schema_file\fR |
1803 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1804 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1805 | -.\" Date: 09/09/2013 |
1806 | +.\" Date: 11/04/2013 |
1807 | .\" Manual: MySQL Database System |
1808 | .\" Source: MySQL 5.5 |
1809 | .\" Language: English |
1810 | .\" |
1811 | -.TH "\FBNDB_PRINT_SCHEMA_" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1812 | +.TH "\FBNDB_PRINT_SCHEMA_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1813 | .\" ----------------------------------------------------------------- |
1814 | .\" * Define some portability stuff |
1815 | .\" ----------------------------------------------------------------- |
1816 | |
1817 | === modified file 'Percona-Server/man/ndb_print_sys_file.1' |
1818 | --- Percona-Server/man/ndb_print_sys_file.1 2013-10-22 13:33:14 +0000 |
1819 | +++ Percona-Server/man/ndb_print_sys_file.1 2013-12-05 18:48:48 +0000 |
1820 | @@ -2,12 +2,12 @@ |
1821 | .\" Title: \fBndb_print_sys_file\fR |
1822 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1823 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1824 | -.\" Date: 09/09/2013 |
1825 | +.\" Date: 11/04/2013 |
1826 | .\" Manual: MySQL Database System |
1827 | .\" Source: MySQL 5.5 |
1828 | .\" Language: English |
1829 | .\" |
1830 | -.TH "\FBNDB_PRINT_SYS_FIL" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1831 | +.TH "\FBNDB_PRINT_SYS_FIL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1832 | .\" ----------------------------------------------------------------- |
1833 | .\" * Define some portability stuff |
1834 | .\" ----------------------------------------------------------------- |
1835 | |
1836 | === modified file 'Percona-Server/man/ndb_restore.1' |
1837 | --- Percona-Server/man/ndb_restore.1 2013-10-22 13:33:14 +0000 |
1838 | +++ Percona-Server/man/ndb_restore.1 2013-12-05 18:48:48 +0000 |
1839 | @@ -2,12 +2,12 @@ |
1840 | .\" Title: \fBndb_restore\fR |
1841 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1842 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1843 | -.\" Date: 09/09/2013 |
1844 | +.\" Date: 11/04/2013 |
1845 | .\" Manual: MySQL Database System |
1846 | .\" Source: MySQL 5.5 |
1847 | .\" Language: English |
1848 | .\" |
1849 | -.TH "\FBNDB_RESTORE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1850 | +.TH "\FBNDB_RESTORE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1851 | .\" ----------------------------------------------------------------- |
1852 | .\" * Define some portability stuff |
1853 | .\" ----------------------------------------------------------------- |
1854 | @@ -166,7 +166,9 @@ |
1855 | T} |
1856 | T{ |
1857 | .PP |
1858 | ---restore_data |
1859 | +--restore_data, |
1860 | +.PP |
1861 | +-r |
1862 | T}:T{ |
1863 | Restore table data and logs into NDB Cluster using the NDB API |
1864 | T}:T{ |
1865 | @@ -557,8 +559,8 @@ |
1866 | .RS 4 |
1867 | .\} |
1868 | .nf |
1869 | -ndb_restore [\-c \fIconnectstring\fR] \-n \fInode_id\fR [\-m] \-b \fIbackup_id\fR \e |
1870 | - \-r \-\-backup_path=\fI/path/to/backup/files\fR |
1871 | +ndb_restore [\-c \fIconnection_string\fR] \-n \fInode_id\fR \-b \fIbackup_id\fR \e |
1872 | + [\-m] \-r \-\-backup_path=\fI/path/to/backup/files\fR |
1873 | .fi |
1874 | .if n \{\ |
1875 | .RE |
1876 | |
1877 | === modified file 'Percona-Server/man/ndb_select_all.1' |
1878 | --- Percona-Server/man/ndb_select_all.1 2013-10-22 13:33:14 +0000 |
1879 | +++ Percona-Server/man/ndb_select_all.1 2013-12-05 18:48:48 +0000 |
1880 | @@ -2,12 +2,12 @@ |
1881 | .\" Title: \fBndb_select_all\fR |
1882 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1883 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1884 | -.\" Date: 09/09/2013 |
1885 | +.\" Date: 11/04/2013 |
1886 | .\" Manual: MySQL Database System |
1887 | .\" Source: MySQL 5.5 |
1888 | .\" Language: English |
1889 | .\" |
1890 | -.TH "\FBNDB_SELECT_ALL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1891 | +.TH "\FBNDB_SELECT_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1892 | .\" ----------------------------------------------------------------- |
1893 | .\" * Define some portability stuff |
1894 | .\" ----------------------------------------------------------------- |
1895 | |
1896 | === modified file 'Percona-Server/man/ndb_select_count.1' |
1897 | --- Percona-Server/man/ndb_select_count.1 2013-10-22 13:33:14 +0000 |
1898 | +++ Percona-Server/man/ndb_select_count.1 2013-12-05 18:48:48 +0000 |
1899 | @@ -2,12 +2,12 @@ |
1900 | .\" Title: \fBndb_select_count\fR |
1901 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1902 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1903 | -.\" Date: 09/09/2013 |
1904 | +.\" Date: 11/04/2013 |
1905 | .\" Manual: MySQL Database System |
1906 | .\" Source: MySQL 5.5 |
1907 | .\" Language: English |
1908 | .\" |
1909 | -.TH "\FBNDB_SELECT_COUNT\" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1910 | +.TH "\FBNDB_SELECT_COUNT\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1911 | .\" ----------------------------------------------------------------- |
1912 | .\" * Define some portability stuff |
1913 | .\" ----------------------------------------------------------------- |
1914 | |
1915 | === modified file 'Percona-Server/man/ndb_show_tables.1' |
1916 | --- Percona-Server/man/ndb_show_tables.1 2013-10-22 13:33:14 +0000 |
1917 | +++ Percona-Server/man/ndb_show_tables.1 2013-12-05 18:48:48 +0000 |
1918 | @@ -2,12 +2,12 @@ |
1919 | .\" Title: \fBndb_show_tables\fR |
1920 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1921 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1922 | -.\" Date: 09/09/2013 |
1923 | +.\" Date: 11/04/2013 |
1924 | .\" Manual: MySQL Database System |
1925 | .\" Source: MySQL 5.5 |
1926 | .\" Language: English |
1927 | .\" |
1928 | -.TH "\FBNDB_SHOW_TABLES\F" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1929 | +.TH "\FBNDB_SHOW_TABLES\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1930 | .\" ----------------------------------------------------------------- |
1931 | .\" * Define some portability stuff |
1932 | .\" ----------------------------------------------------------------- |
1933 | |
1934 | === modified file 'Percona-Server/man/ndb_size.pl.1' |
1935 | --- Percona-Server/man/ndb_size.pl.1 2013-10-22 13:33:14 +0000 |
1936 | +++ Percona-Server/man/ndb_size.pl.1 2013-12-05 18:48:48 +0000 |
1937 | @@ -2,12 +2,12 @@ |
1938 | .\" Title: \fBndb_size.pl\fR |
1939 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1940 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1941 | -.\" Date: 09/09/2013 |
1942 | +.\" Date: 11/04/2013 |
1943 | .\" Manual: MySQL Database System |
1944 | .\" Source: MySQL 5.5 |
1945 | .\" Language: English |
1946 | .\" |
1947 | -.TH "\FBNDB_SIZE\&.PL\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1948 | +.TH "\FBNDB_SIZE\&.PL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1949 | .\" ----------------------------------------------------------------- |
1950 | .\" * Define some portability stuff |
1951 | .\" ----------------------------------------------------------------- |
1952 | |
1953 | === modified file 'Percona-Server/man/ndb_waiter.1' |
1954 | --- Percona-Server/man/ndb_waiter.1 2013-10-22 13:33:14 +0000 |
1955 | +++ Percona-Server/man/ndb_waiter.1 2013-12-05 18:48:48 +0000 |
1956 | @@ -2,12 +2,12 @@ |
1957 | .\" Title: \fBndb_waiter\fR |
1958 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1959 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1960 | -.\" Date: 09/09/2013 |
1961 | +.\" Date: 11/04/2013 |
1962 | .\" Manual: MySQL Database System |
1963 | .\" Source: MySQL 5.5 |
1964 | .\" Language: English |
1965 | .\" |
1966 | -.TH "\FBNDB_WAITER\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1967 | +.TH "\FBNDB_WAITER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1968 | .\" ----------------------------------------------------------------- |
1969 | .\" * Define some portability stuff |
1970 | .\" ----------------------------------------------------------------- |
1971 | |
1972 | === modified file 'Percona-Server/man/ndbd.8' |
1973 | --- Percona-Server/man/ndbd.8 2013-10-22 13:33:14 +0000 |
1974 | +++ Percona-Server/man/ndbd.8 2013-12-05 18:48:48 +0000 |
1975 | @@ -2,12 +2,12 @@ |
1976 | .\" Title: \fBndbd\fR |
1977 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1978 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1979 | -.\" Date: 09/09/2013 |
1980 | +.\" Date: 11/04/2013 |
1981 | .\" Manual: MySQL Database System |
1982 | .\" Source: MySQL 5.5 |
1983 | .\" Language: English |
1984 | .\" |
1985 | -.TH "\FBNDBD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
1986 | +.TH "\FBNDBD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
1987 | .\" ----------------------------------------------------------------- |
1988 | .\" * Define some portability stuff |
1989 | .\" ----------------------------------------------------------------- |
1990 | |
1991 | === modified file 'Percona-Server/man/ndbd_redo_log_reader.1' |
1992 | --- Percona-Server/man/ndbd_redo_log_reader.1 2013-10-22 13:33:14 +0000 |
1993 | +++ Percona-Server/man/ndbd_redo_log_reader.1 2013-12-05 18:48:48 +0000 |
1994 | @@ -2,12 +2,12 @@ |
1995 | .\" Title: \fBndbd_redo_log_reader\fR |
1996 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
1997 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
1998 | -.\" Date: 09/09/2013 |
1999 | +.\" Date: 11/04/2013 |
2000 | .\" Manual: MySQL Database System |
2001 | .\" Source: MySQL 5.5 |
2002 | .\" Language: English |
2003 | .\" |
2004 | -.TH "\FBNDBD_REDO_LOG_REA" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
2005 | +.TH "\FBNDBD_REDO_LOG_REA" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
2006 | .\" ----------------------------------------------------------------- |
2007 | .\" * Define some portability stuff |
2008 | .\" ----------------------------------------------------------------- |
2009 | @@ -68,6 +68,7 @@ |
2010 | T} |
2011 | .T& |
2012 | l l l |
2013 | +l l l |
2014 | l l l. |
2015 | T{ |
2016 | .PP |
2017 | @@ -87,6 +88,15 @@ |
2018 | .PP |
2019 | All MySQL 5\&.5 based releases |
2020 | T} |
2021 | +T{ |
2022 | +.PP |
2023 | +--help |
2024 | +T}:T{ |
2025 | +Print usage information |
2026 | +T}:T{ |
2027 | +.PP |
2028 | +ADDED: NDB 7\&.2\&.15 |
2029 | +T} |
2030 | .TE |
2031 | .sp 1 |
2032 | Usage |
2033 | @@ -187,6 +197,35 @@ |
2034 | .sp 1 |
2035 | \fB\-nocheck\fR: Do not check the log file for errors\&. |
2036 | .RE |
2037 | +.sp |
2038 | +.RS 4 |
2039 | +.ie n \{\ |
2040 | +\h'-04'\(bu\h'+03'\c |
2041 | +.\} |
2042 | +.el \{\ |
2043 | +.sp -1 |
2044 | +.IP \(bu 2.3 |
2045 | +.\} |
2046 | +.TS |
2047 | +allbox tab(:); |
2048 | +l l s s |
2049 | +l l s s. |
2050 | +T{ |
2051 | +\fBIntroduced\fR |
2052 | +T}:T{ |
2053 | +5\&.5\&.34\-ndb\-7\&.2\&.15 |
2054 | +T} |
2055 | +T{ |
2056 | +\fBCommand\-Line Format\fR |
2057 | +T}:T{ |
2058 | +\-\-help |
2059 | +T} |
2060 | +.TE |
2061 | +.sp 1 |
2062 | +\fB\-\-help\fR: Print usage information\&. |
2063 | +.sp |
2064 | +Added in MySQL Cluster NDB 7\&.2\&.15\&. (Bug #11749591, Bug #36805) |
2065 | +.RE |
2066 | .PP |
2067 | Like |
2068 | \fBndb_print_backup_file\fR |
2069 | |
2070 | === modified file 'Percona-Server/man/ndbinfo_select_all.1' |
2071 | --- Percona-Server/man/ndbinfo_select_all.1 2013-10-23 08:23:08 +0000 |
2072 | +++ Percona-Server/man/ndbinfo_select_all.1 2013-12-05 18:48:48 +0000 |
2073 | @@ -2,12 +2,12 @@ |
2074 | .\" Title: \fBndbinfo_select_all\fR |
2075 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
2076 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
2077 | -.\" Date: 09/09/2013 |
2078 | +.\" Date: 11/04/2013 |
2079 | .\" Manual: MySQL Database System |
2080 | .\" Source: MySQL 5.5 |
2081 | .\" Language: English |
2082 | .\" |
2083 | -.TH "\FBNDBINFO_SELECT_AL" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
2084 | +.TH "\FBNDBINFO_SELECT_AL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
2085 | .\" ----------------------------------------------------------------- |
2086 | .\" * Define some portability stuff |
2087 | .\" ----------------------------------------------------------------- |
2088 | |
2089 | === modified file 'Percona-Server/man/ndbmtd.8' |
2090 | --- Percona-Server/man/ndbmtd.8 2013-10-22 13:33:14 +0000 |
2091 | +++ Percona-Server/man/ndbmtd.8 2013-12-05 18:48:48 +0000 |
2092 | @@ -2,12 +2,12 @@ |
2093 | .\" Title: \fBndbmtd\fR |
2094 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
2095 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
2096 | -.\" Date: 09/09/2013 |
2097 | +.\" Date: 11/04/2013 |
2098 | .\" Manual: MySQL Database System |
2099 | .\" Source: MySQL 5.5 |
2100 | .\" Language: English |
2101 | .\" |
2102 | -.TH "\FBNDBMTD\FR" "8" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
2103 | +.TH "\FBNDBMTD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
2104 | .\" ----------------------------------------------------------------- |
2105 | .\" * Define some portability stuff |
2106 | .\" ----------------------------------------------------------------- |
2107 | @@ -151,7 +151,7 @@ |
2108 | .RS 4 |
2109 | .\} |
2110 | .nf |
2111 | - ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR_t\fIthread_id\fR, |
2112 | +ndb_\fInode_id\fR_trace\&.log\&.\fItrace_id\fR_t\fIthread_id\fR, |
2113 | .fi |
2114 | .if n \{\ |
2115 | .RE |
2116 | |
2117 | === modified file 'Percona-Server/man/perror.1' |
2118 | --- Percona-Server/man/perror.1 2013-10-22 13:33:14 +0000 |
2119 | +++ Percona-Server/man/perror.1 2013-12-05 18:48:48 +0000 |
2120 | @@ -2,12 +2,12 @@ |
2121 | .\" Title: \fBperror\fR |
2122 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
2123 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
2124 | -.\" Date: 09/09/2013 |
2125 | +.\" Date: 11/04/2013 |
2126 | .\" Manual: MySQL Database System |
2127 | .\" Source: MySQL 5.5 |
2128 | .\" Language: English |
2129 | .\" |
2130 | -.TH "\FBPERROR\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
2131 | +.TH "\FBPERROR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
2132 | .\" ----------------------------------------------------------------- |
2133 | .\" * Define some portability stuff |
2134 | .\" ----------------------------------------------------------------- |
2135 | |
2136 | === modified file 'Percona-Server/man/replace.1' |
2137 | --- Percona-Server/man/replace.1 2013-10-22 13:33:14 +0000 |
2138 | +++ Percona-Server/man/replace.1 2013-12-05 18:48:48 +0000 |
2139 | @@ -2,12 +2,12 @@ |
2140 | .\" Title: \fBreplace\fR |
2141 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
2142 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
2143 | -.\" Date: 09/09/2013 |
2144 | +.\" Date: 11/04/2013 |
2145 | .\" Manual: MySQL Database System |
2146 | .\" Source: MySQL 5.5 |
2147 | .\" Language: English |
2148 | .\" |
2149 | -.TH "\FBREPLACE\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
2150 | +.TH "\FBREPLACE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
2151 | .\" ----------------------------------------------------------------- |
2152 | .\" * Define some portability stuff |
2153 | .\" ----------------------------------------------------------------- |
2154 | |
2155 | === modified file 'Percona-Server/man/resolve_stack_dump.1' |
2156 | --- Percona-Server/man/resolve_stack_dump.1 2013-10-22 13:33:14 +0000 |
2157 | +++ Percona-Server/man/resolve_stack_dump.1 2013-12-05 18:48:48 +0000 |
2158 | @@ -2,12 +2,12 @@ |
2159 | .\" Title: \fBresolve_stack_dump\fR |
2160 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
2161 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
2162 | -.\" Date: 09/09/2013 |
2163 | +.\" Date: 11/04/2013 |
2164 | .\" Manual: MySQL Database System |
2165 | .\" Source: MySQL 5.5 |
2166 | .\" Language: English |
2167 | .\" |
2168 | -.TH "\FBRESOLVE_STACK_DUM" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
2169 | +.TH "\FBRESOLVE_STACK_DUM" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
2170 | .\" ----------------------------------------------------------------- |
2171 | .\" * Define some portability stuff |
2172 | .\" ----------------------------------------------------------------- |
2173 | |
2174 | === modified file 'Percona-Server/man/resolveip.1' |
2175 | --- Percona-Server/man/resolveip.1 2013-10-22 13:33:14 +0000 |
2176 | +++ Percona-Server/man/resolveip.1 2013-12-05 18:48:48 +0000 |
2177 | @@ -2,12 +2,12 @@ |
2178 | .\" Title: \fBresolveip\fR |
2179 | .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
2180 | .\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/> |
2181 | -.\" Date: 09/09/2013 |
2182 | +.\" Date: 11/04/2013 |
2183 | .\" Manual: MySQL Database System |
2184 | .\" Source: MySQL 5.5 |
2185 | .\" Language: English |
2186 | .\" |
2187 | -.TH "\FBRESOLVEIP\FR" "1" "09/09/2013" "MySQL 5\&.5" "MySQL Database System" |
2188 | +.TH "\FBRESOLVEIP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System" |
2189 | .\" ----------------------------------------------------------------- |
2190 | .\" * Define some portability stuff |
2191 | .\" ----------------------------------------------------------------- |
2192 | |
2193 | === modified file 'Percona-Server/mysql-test/collections/default.experimental' |
2194 | --- Percona-Server/mysql-test/collections/default.experimental 2013-07-23 12:48:19 +0000 |
2195 | +++ Percona-Server/mysql-test/collections/default.experimental 2013-12-05 18:48:48 +0000 |
2196 | @@ -15,6 +15,7 @@ |
2197 | |
2198 | rpl.rpl_innodb_bug28430 # Bug#11754425 |
2199 | rpl.rpl_row_sp011 @solaris # Bug#11753919 2011-07-25 sven Several test cases fail on Solaris with error Thread stack overrun |
2200 | +rpl.rpl_spec_variables @solaris # Bug #17337114 2013-08-20 Luis Soares failing on pb2 with timeout for 'CHECK WARNINGS' |
2201 | |
2202 | sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun |
2203 | sys_vars.wait_timeout_func # Bug#11750645 2010-04-26 alik wait_timeout_func fails |
2204 | |
2205 | === modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc' |
2206 | --- Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc 2010-11-17 10:16:13 +0000 |
2207 | +++ Percona-Server/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc 2013-12-05 18:48:48 +0000 |
2208 | @@ -150,10 +150,9 @@ |
2209 | } |
2210 | |
2211 | # |
2212 | -# Drops tables and synchronizes master and slave. Note that temporary |
2213 | -# tables are not explitcily dropped as they will be dropped while |
2214 | -# closing the connection. |
2215 | +# Drops tables and synchronizes master and slave. |
2216 | # |
2217 | + |
2218 | if (`SELECT HEX(@commands) = HEX('clean')`) |
2219 | { |
2220 | connection master; |
2221 | @@ -162,10 +161,15 @@ |
2222 | |
2223 | DROP TABLE IF EXISTS nt_xx_1; |
2224 | |
2225 | + DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1; |
2226 | + DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1; |
2227 | + |
2228 | --let $n= $tot_table |
2229 | while ($n) |
2230 | { |
2231 | --eval DROP TABLE IF EXISTS nt_$n |
2232 | + --eval DROP TEMPORARY TABLE IF EXISTS tt_tmp_$n |
2233 | + --eval DROP TEMPORARY TABLE IF EXISTS nt_tmp_$n |
2234 | --dec $n |
2235 | } |
2236 | |
2237 | |
2238 | === modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test' |
2239 | --- Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test 2010-12-19 17:15:12 +0000 |
2240 | +++ Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test 2013-12-05 18:48:48 +0000 |
2241 | @@ -112,7 +112,7 @@ |
2242 | --echo -------- switch to master -------- |
2243 | connection master; |
2244 | FLUSH LOGS; |
2245 | - |
2246 | +DROP TEMPORARY TABLE IF EXISTS mysqltest1.tmp2; |
2247 | DROP DATABASE mysqltest1; |
2248 | |
2249 | --echo End of 5.1 tests |
2250 | |
2251 | === modified file 'Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test' |
2252 | --- Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test 2011-07-18 17:18:03 +0000 |
2253 | +++ Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test 2013-12-05 18:48:48 +0000 |
2254 | @@ -38,6 +38,9 @@ |
2255 | source include/start_slave.inc; |
2256 | sync_with_master; |
2257 | show status like 'slave_open_temp_tables'; |
2258 | +connection master; |
2259 | +drop temporary table if exists t1; |
2260 | +sync_slave_with_master; |
2261 | |
2262 | # |
2263 | #Bug#34654 RESET SLAVE does not clear LAST_IO_Err* |
2264 | |
2265 | === modified file 'Percona-Server/mysql-test/include/mtr_check.sql' |
2266 | --- Percona-Server/mysql-test/include/mtr_check.sql 2012-05-10 07:49:14 +0000 |
2267 | +++ Percona-Server/mysql-test/include/mtr_check.sql 2013-12-05 18:48:48 +0000 |
2268 | @@ -72,6 +72,8 @@ |
2269 | mysql.time_zone_transition_type, |
2270 | mysql.user; |
2271 | |
2272 | + show status like 'slave_open_temp_tables'; |
2273 | + |
2274 | END|| |
2275 | |
2276 | -- |
2277 | |
2278 | === added file 'Percona-Server/mysql-test/include/search_pattern_in_file.inc' |
2279 | --- Percona-Server/mysql-test/include/search_pattern_in_file.inc 1970-01-01 00:00:00 +0000 |
2280 | +++ Percona-Server/mysql-test/include/search_pattern_in_file.inc 2013-12-05 18:48:48 +0000 |
2281 | @@ -0,0 +1,66 @@ |
2282 | +# Purpose: |
2283 | +# Simple search with Perl for a pattern in some file. |
2284 | +# |
2285 | +# The advantages compared to thinkable auxiliary constructs using the |
2286 | +# mysqltest language and SQL are: |
2287 | +# 1. We do not need a running MySQL server. |
2288 | +# 2. SQL causes "noise" during debugging and increases the size of logs. |
2289 | +# Perl code does not disturb at all. |
2290 | +# |
2291 | +# The environment variables SEARCH_FILE and SEARCH_PATTERN must be set |
2292 | +# before sourcing this routine. |
2293 | +# |
2294 | +# In case of |
2295 | +# - SEARCH_FILE and/or SEARCH_PATTERN is not set |
2296 | +# - SEARCH_FILE cannot be opened |
2297 | +# - SEARCH_FILE does not contain SEARCH_PATTERN |
2298 | +# the test will abort immediate. |
2299 | +# MTR will report something like |
2300 | +# .... |
2301 | +# worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 13000..13009 |
2302 | +# main.1st [ pass ] 3 |
2303 | +# innodb.innodb_page_size [ fail ] |
2304 | +# Test ended at 2011-11-11 18:15:58 |
2305 | +# |
2306 | +# CURRENT_TEST: innodb.innodb_page_size |
2307 | +# # ERROR: The file '<name>' does not contain the expected pattern <pattern> |
2308 | +# mysqltest: In included file "./include/search_pattern_in_file.inc": |
2309 | +# included from ./include/search_pattern_in_file.inc at line 36: |
2310 | +# At line 25: command "perl" failed with error 255. my_errno=175 |
2311 | +# |
2312 | +# The result from queries just before the failure was: |
2313 | +# ... |
2314 | +# - saving '<some path>' to '<some path>' |
2315 | +# main.1st [ pass ] 2 |
2316 | +# |
2317 | +# Typical use case (check invalid server startup options): |
2318 | +# let $error_log= $MYSQLTEST_VARDIR/log/my_restart.err; |
2319 | +# --error 0,1 |
2320 | +# --remove_file $error_log |
2321 | +# let SEARCH_FILE= $error_log; |
2322 | +# # Stop the server |
2323 | +# let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; |
2324 | +# --exec echo "wait" > $restart_file |
2325 | +# --shutdown_server 10 |
2326 | +# --source include/wait_until_disconnected.inc |
2327 | +# |
2328 | +# --error 1 |
2329 | +# --exec $MYSQLD_CMD <whatever wrong setting> > $error_log 2>&1 |
2330 | +# # The server restart aborts |
2331 | +# let SEARCH_PATTERN= \[ERROR\] Aborting; |
2332 | +# --source include/search_pattern_in_file.inc |
2333 | +# |
2334 | +# Created: 2011-11-11 mleich |
2335 | +# |
2336 | + |
2337 | +perl; |
2338 | + use strict; |
2339 | + my $search_file= $ENV{'SEARCH_FILE'} or die "SEARCH_FILE not set"; |
2340 | + my $search_pattern= $ENV{'SEARCH_PATTERN'} or die "SEARCH_PATTERN not set"; |
2341 | + open(FILE, "$search_file") or die("Unable to open '$search_file': $!\n"); |
2342 | + read(FILE, my $file_content, 50000, 0); |
2343 | + close(FILE); |
2344 | + if ( not $file_content =~ m{$search_pattern} ) { |
2345 | + die("# ERROR: The file '$search_file' does not contain the expected pattern $search_pattern\n->$file_content<-\n"); |
2346 | + } |
2347 | +EOF |
2348 | |
2349 | === modified file 'Percona-Server/mysql-test/mysql-test-run.pl' |
2350 | --- Percona-Server/mysql-test/mysql-test-run.pl 2013-08-14 03:52:04 +0000 |
2351 | +++ Percona-Server/mysql-test/mysql-test-run.pl 2013-12-05 18:48:48 +0000 |
2352 | @@ -4364,7 +4364,7 @@ |
2353 | { |
2354 | # Remove initial timestamp and look for consecutive identical lines |
2355 | my $line_pat= $line; |
2356 | - $line_pat =~ s/^[0-9: ]*//; |
2357 | + $line_pat =~ s/^[0-9:\-\+\.TZ ]*//; |
2358 | if ($line_pat eq $last_pat) { |
2359 | $num_rep++; |
2360 | } else { |
2361 | @@ -6013,7 +6013,7 @@ |
2362 | # Special override: also ignore in Pushbuild, some platforms may not have it |
2363 | # Now, run ctest and collect output |
2364 | my $ctest_out= `ctest $ctest_vs 2>&1`; |
2365 | - if ($? == $no_ctest && $opt_ctest == -1 && ! defined $ENV{PB2WORKDIR}) { |
2366 | + if ($? == $no_ctest && ($opt_ctest == -1 || defined $ENV{PB2WORKDIR})) { |
2367 | chdir($olddir); |
2368 | return; |
2369 | } |
2370 | |
2371 | === modified file 'Percona-Server/mysql-test/r/openssl_1.result' |
2372 | --- Percona-Server/mysql-test/r/openssl_1.result 2012-08-11 10:22:11 +0000 |
2373 | +++ Percona-Server/mysql-test/r/openssl_1.result 2013-12-05 18:48:48 +0000 |
2374 | @@ -83,7 +83,7 @@ |
2375 | SHOW STATUS LIKE 'Ssl_cipher'; |
2376 | Variable_name Value |
2377 | Ssl_cipher AES128-SHA |
2378 | -mysqltest: Could not open connection 'default': 2026 SSL connection error: SSL_CTX_new failed |
2379 | +mysqltest: Could not open connection 'default': 2026 SSL connection error: Failed to set ciphers to use |
2380 | CREATE TABLE t1(a int); |
2381 | INSERT INTO t1 VALUES (1), (2); |
2382 | |
2383 | |
2384 | === modified file 'Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result' |
2385 | --- Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result 2011-12-22 11:05:33 +0000 |
2386 | +++ Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result 2013-12-05 18:48:48 +0000 |
2387 | @@ -6,5 +6,5 @@ |
2388 | c |
2389 | HANDLER bug13510739 READ `primary` NEXT; |
2390 | c |
2391 | -4 |
2392 | +3 |
2393 | DROP TABLE bug13510739; |
2394 | |
2395 | === modified file 'Percona-Server/mysql-test/suite/innodb/t/innodb.test' |
2396 | --- Percona-Server/mysql-test/suite/innodb/t/innodb.test 2012-05-10 07:49:14 +0000 |
2397 | +++ Percona-Server/mysql-test/suite/innodb/t/innodb.test 2013-12-05 18:48:48 +0000 |
2398 | @@ -1,9 +1,3 @@ |
2399 | ---source include/not_windows_embedded.inc |
2400 | -# remove this when |
2401 | -# Bug#53947 InnoDB: Assertion failure in thread 4224 in file |
2402 | -# .\sync\sync0sync.c line 324 |
2403 | -# is fixed |
2404 | - |
2405 | ####################################################################### |
2406 | # # |
2407 | # Please, DO NOT TOUCH this file as well as the innodb.result file. # |
2408 | |
2409 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result' |
2410 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result 2010-12-19 17:15:12 +0000 |
2411 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result 2013-12-05 18:48:48 +0000 |
2412 | @@ -15,4 +15,7 @@ |
2413 | master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp |
2414 | master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp1 LIKE tmp |
2415 | master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp |
2416 | +DROP TEMPORARY TABLE tmp; |
2417 | +DROP TEMPORARY TABLE tmp1; |
2418 | +DROP TEMPORARY TABLE tmp2; |
2419 | include/rpl_end.inc |
2420 | |
2421 | === added file 'Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result' |
2422 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result 1970-01-01 00:00:00 +0000 |
2423 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result 2013-12-05 18:48:48 +0000 |
2424 | @@ -0,0 +1,14 @@ |
2425 | +include/master-slave.inc |
2426 | +[connection master] |
2427 | +SET @debug_saved= @@GLOBAL.DEBUG; |
2428 | +CREATE TABLE t (i INT); |
2429 | +SET GLOBAL DEBUG= "d,wait_after_binlog_EOF"; |
2430 | +INSERT INTO t VALUES (1); |
2431 | +INSERT INTO t VALUES (2); |
2432 | +FLUSH LOGS; |
2433 | +SET DEBUG_SYNC= 'now SIGNAL signal.rotate_finished'; |
2434 | +include/diff_tables.inc [master:t,slave:t] |
2435 | +SET @@GLOBAL.DEBUG= @debug_saved; |
2436 | +SET DEBUG_SYNC= 'RESET'; |
2437 | +DROP TABLE t; |
2438 | +include/rpl_end.inc |
2439 | |
2440 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result' |
2441 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result 2010-12-19 17:15:12 +0000 |
2442 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result 2013-12-05 18:48:48 +0000 |
2443 | @@ -42,4 +42,5 @@ |
2444 | `created` datetime DEFAULT NULL |
2445 | ) ENGINE=MyISAM DEFAULT CHARSET=latin1 |
2446 | drop table t2,t3,t5; |
2447 | +drop temporary table t4; |
2448 | include/rpl_end.inc |
2449 | |
2450 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result' |
2451 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result 2013-07-27 12:05:02 +0000 |
2452 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result 2013-12-05 18:48:48 +0000 |
2453 | @@ -1554,8 +1554,14 @@ |
2454 | SET @commands= 'clean'; |
2455 | DROP TABLE IF EXISTS tt_xx_1; |
2456 | DROP TABLE IF EXISTS nt_xx_1; |
2457 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1; |
2458 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1; |
2459 | DROP TABLE IF EXISTS nt_2; |
2460 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_2; |
2461 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_2; |
2462 | DROP TABLE IF EXISTS nt_1; |
2463 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_1; |
2464 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_1; |
2465 | DROP TABLE IF EXISTS tt_2; |
2466 | DROP TABLE IF EXISTS tt_1; |
2467 | SET @commands= ''; |
2468 | |
2469 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result' |
2470 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2012-12-04 16:09:48 +0000 |
2471 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2013-12-05 18:48:48 +0000 |
2472 | @@ -85,6 +85,7 @@ |
2473 | include/assert.inc [Table t3 should contain 100 lines on the slave] |
2474 | unlock tables; |
2475 | drop table if exists t1,t2,t3,t4; |
2476 | +drop temporary table temp_table; |
2477 | End of 4.1 tests |
2478 | show binlog events in 'non existing_binlog_file'; |
2479 | ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log |
2480 | |
2481 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result' |
2482 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result 2013-07-27 12:05:02 +0000 |
2483 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result 2013-12-05 18:48:48 +0000 |
2484 | @@ -1619,8 +1619,14 @@ |
2485 | SET @commands= 'clean'; |
2486 | DROP TABLE IF EXISTS tt_xx_1; |
2487 | DROP TABLE IF EXISTS nt_xx_1; |
2488 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1; |
2489 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1; |
2490 | DROP TABLE IF EXISTS nt_2; |
2491 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_2; |
2492 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_2; |
2493 | DROP TABLE IF EXISTS nt_1; |
2494 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_1; |
2495 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_1; |
2496 | DROP TABLE IF EXISTS tt_2; |
2497 | DROP TABLE IF EXISTS tt_1; |
2498 | SET @commands= ''; |
2499 | |
2500 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result' |
2501 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2011-07-18 17:18:03 +0000 |
2502 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2013-12-05 18:48:48 +0000 |
2503 | @@ -23,6 +23,7 @@ |
2504 | show status like 'slave_open_temp_tables'; |
2505 | Variable_name Value |
2506 | Slave_open_temp_tables 0 |
2507 | +drop temporary table if exists t1; |
2508 | include/stop_slave.inc |
2509 | reset slave; |
2510 | include/check_slave_no_error.inc |
2511 | |
2512 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result' |
2513 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result 2011-03-18 14:16:17 +0000 |
2514 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result 2013-12-05 18:48:48 +0000 |
2515 | @@ -48,6 +48,7 @@ |
2516 | 0 |
2517 | kill @id; |
2518 | drop table t2; |
2519 | +drop temporary table t3; |
2520 | Got one of the listed errors |
2521 | include/wait_for_slave_sql_error_and_skip.inc [errno=1053] |
2522 | select count(*) from t1; |
2523 | |
2524 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result' |
2525 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result 2013-07-27 12:05:02 +0000 |
2526 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result 2013-12-05 18:48:48 +0000 |
2527 | @@ -1604,8 +1604,14 @@ |
2528 | SET @commands= 'clean'; |
2529 | DROP TABLE IF EXISTS tt_xx_1; |
2530 | DROP TABLE IF EXISTS nt_xx_1; |
2531 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_xx_1; |
2532 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_xx_1; |
2533 | DROP TABLE IF EXISTS nt_2; |
2534 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_2; |
2535 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_2; |
2536 | DROP TABLE IF EXISTS nt_1; |
2537 | +DROP TEMPORARY TABLE IF EXISTS tt_tmp_1; |
2538 | +DROP TEMPORARY TABLE IF EXISTS nt_tmp_1; |
2539 | DROP TABLE IF EXISTS tt_2; |
2540 | DROP TABLE IF EXISTS tt_1; |
2541 | SET @commands= ''; |
2542 | |
2543 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result' |
2544 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result 2010-12-19 17:15:12 +0000 |
2545 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result 2013-12-05 18:48:48 +0000 |
2546 | @@ -79,6 +79,7 @@ |
2547 | FLUSH LOGS; |
2548 | -------- switch to master -------- |
2549 | FLUSH LOGS; |
2550 | +DROP TEMPORARY TABLE IF EXISTS mysqltest1.tmp2; |
2551 | DROP DATABASE mysqltest1; |
2552 | End of 5.1 tests |
2553 | # |
2554 | |
2555 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result' |
2556 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2011-07-18 17:18:03 +0000 |
2557 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2013-12-05 18:48:48 +0000 |
2558 | @@ -23,6 +23,7 @@ |
2559 | show status like 'slave_open_temp_tables'; |
2560 | Variable_name Value |
2561 | Slave_open_temp_tables 1 |
2562 | +drop temporary table if exists t1; |
2563 | include/stop_slave.inc |
2564 | reset slave; |
2565 | include/check_slave_no_error.inc |
2566 | |
2567 | === modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test' |
2568 | --- Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test 2010-12-19 17:07:28 +0000 |
2569 | +++ Percona-Server/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test 2013-12-05 18:48:48 +0000 |
2570 | @@ -38,4 +38,8 @@ |
2571 | CREATE TEMPORARY TABLE IF NOT EXISTS tmp2 SELECT * FROM tmp; |
2572 | source include/show_binlog_events.inc; |
2573 | |
2574 | +DROP TEMPORARY TABLE tmp; |
2575 | +DROP TEMPORARY TABLE tmp1; |
2576 | +DROP TEMPORARY TABLE tmp2; |
2577 | + |
2578 | --source include/rpl_end.inc |
2579 | |
2580 | === added file 'Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test' |
2581 | --- Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test 1970-01-01 00:00:00 +0000 |
2582 | +++ Percona-Server/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test 2013-12-05 18:48:48 +0000 |
2583 | @@ -0,0 +1,51 @@ |
2584 | +# |
2585 | +# Whenever the mysql_binlog_send method (dump thread) reaches the |
2586 | +# end of file when reading events from the binlog, before checking |
2587 | +# if it should wait for more events, there was a test to check if |
2588 | +# the file being read was still active, i.e, it was the last known |
2589 | +# binlog. However, it was possible that something was written to |
2590 | +# the binary log and then a rotation would happen, after EOF was |
2591 | +# detected and before the check for active was performed. In this |
2592 | +# case, the end of the binary log would not be read by the dump |
2593 | +# thread, and this would cause the slave to lose updates. |
2594 | +# |
2595 | +# This test verifies that the problem has been fixed. It waits |
2596 | +# during this window while forcing a rotation in the binlog. |
2597 | +# |
2598 | +--source include/have_debug.inc |
2599 | +--source include/master-slave.inc |
2600 | + |
2601 | +--connection master |
2602 | + |
2603 | +SET @debug_saved= @@GLOBAL.DEBUG; |
2604 | + |
2605 | +CREATE TABLE t (i INT); |
2606 | + |
2607 | +# When reaching the EOF the dump thread will wait before deciding if |
2608 | +# it should move to a new binlong file. |
2609 | +SET GLOBAL DEBUG= "d,wait_after_binlog_EOF"; |
2610 | + |
2611 | +INSERT INTO t VALUES (1); |
2612 | + |
2613 | +--sleep 1 |
2614 | + |
2615 | +# A insert and a rotate happens before the decision |
2616 | +INSERT INTO t VALUES (2); |
2617 | +FLUSH LOGS; |
2618 | + |
2619 | +SET DEBUG_SYNC= 'now SIGNAL signal.rotate_finished'; |
2620 | + |
2621 | +--sync_slave_with_master |
2622 | + |
2623 | +# All the rows should be sent to the slave. |
2624 | +--let $diff_tables=master:t,slave:t |
2625 | +--source include/diff_tables.inc |
2626 | + |
2627 | +##Clean up |
2628 | +--connection master |
2629 | + |
2630 | +SET @@GLOBAL.DEBUG= @debug_saved; |
2631 | +SET DEBUG_SYNC= 'RESET'; |
2632 | + |
2633 | +DROP TABLE t; |
2634 | +--source include/rpl_end.inc |
2635 | |
2636 | === modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test' |
2637 | --- Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test 2010-12-19 17:15:12 +0000 |
2638 | +++ Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test 2013-12-05 18:48:48 +0000 |
2639 | @@ -43,6 +43,7 @@ |
2640 | show create table t5; |
2641 | connection master; |
2642 | drop table t2,t3,t5; |
2643 | +drop temporary table t4; |
2644 | sync_slave_with_master; |
2645 | |
2646 | # End of 4.1 tests |
2647 | |
2648 | === modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test' |
2649 | --- Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test 2012-12-04 16:09:48 +0000 |
2650 | +++ Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test 2013-12-05 18:48:48 +0000 |
2651 | @@ -218,6 +218,7 @@ |
2652 | #clean up |
2653 | connection master; |
2654 | drop table if exists t1,t2,t3,t4; |
2655 | +drop temporary table temp_table; |
2656 | sync_slave_with_master; |
2657 | |
2658 | --echo End of 4.1 tests |
2659 | |
2660 | === modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test' |
2661 | --- Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test 2010-12-19 17:15:12 +0000 |
2662 | +++ Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test 2013-12-05 18:48:48 +0000 |
2663 | @@ -91,8 +91,8 @@ |
2664 | sleep 3; |
2665 | select (@id := id) - id from t2; |
2666 | kill @id; |
2667 | -# We don't drop t3 as this is a temporary table |
2668 | drop table t2; |
2669 | +drop temporary table t3; |
2670 | connection master; |
2671 | # The get_lock function causes warning for unsafe statement. |
2672 | --disable_warnings |
2673 | |
2674 | === modified file 'Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test' |
2675 | --- Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test 2010-05-25 07:36:06 +0000 |
2676 | +++ Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test 2013-12-05 18:48:48 +0000 |
2677 | @@ -1,9 +1,3 @@ |
2678 | ---source include/not_windows_embedded.inc |
2679 | -# remove this when |
2680 | -# Bug#53947 InnoDB: Assertion failure in thread 4224 in file |
2681 | -# .\sync\sync0sync.c line 324 |
2682 | -# is fixed |
2683 | - |
2684 | #################### mysql-test\t\identity_func.test ########################## |
2685 | # # |
2686 | # Variable Name: identity # |
2687 | |
2688 | === modified file 'Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test' |
2689 | --- Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test 2010-05-25 07:36:06 +0000 |
2690 | +++ Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test 2013-12-05 18:48:48 +0000 |
2691 | @@ -1,9 +1,3 @@ |
2692 | ---source include/not_windows_embedded.inc |
2693 | -# remove this when |
2694 | -# Bug#53947 InnoDB: Assertion failure in thread 4224 in file |
2695 | -# .\sync\sync0sync.c line 324 |
2696 | -# is fixed |
2697 | - |
2698 | ################# mysql-test\t\innodb_autoinc_lock_mode_func.test ############ |
2699 | # # |
2700 | # Variable Name: innodb_autoinc_lock_mode # |
2701 | |
2702 | === modified file 'Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test' |
2703 | --- Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test 2010-05-25 07:36:06 +0000 |
2704 | +++ Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test 2013-12-05 18:48:48 +0000 |
2705 | @@ -1,9 +1,3 @@ |
2706 | ---source include/not_windows_embedded.inc |
2707 | -# remove this when |
2708 | -# Bug#53947 InnoDB: Assertion failure in thread 4224 in file |
2709 | -# .\sync\sync0sync.c line 324 |
2710 | -# is fixed |
2711 | - |
2712 | ################# mysql-test\t\last_insert_id_func.test ####################### |
2713 | # # |
2714 | # Variable Name: last_insert_id # |
2715 | |
2716 | === modified file 'Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test' |
2717 | --- Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test 2010-06-17 20:51:35 +0000 |
2718 | +++ Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test 2013-12-05 18:48:48 +0000 |
2719 | @@ -1,9 +1,3 @@ |
2720 | ---source include/not_windows_embedded.inc |
2721 | -# remove this when |
2722 | -# Bug#53947 InnoDB: Assertion failure in thread 4224 in file |
2723 | -# .\sync\sync0sync.c line 324 |
2724 | -# is fixed |
2725 | - |
2726 | ############## mysql-test\t\storage_engine_basic.test ################## |
2727 | # # |
2728 | # # |
2729 | |
2730 | === modified file 'Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test' |
2731 | --- Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test 2010-06-07 08:47:04 +0000 |
2732 | +++ Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test 2013-12-05 18:48:48 +0000 |
2733 | @@ -1,9 +1,3 @@ |
2734 | ---source include/not_windows_embedded.inc |
2735 | -# remove this when |
2736 | -# Bug#53947 InnoDB: Assertion failure in thread 4224 in file |
2737 | -# .\sync\sync0sync.c line 324 |
2738 | -# is fixed |
2739 | - |
2740 | ############# mysql-test\t\tx_isolation_func.test ####################################### |
2741 | # # |
2742 | # Variable Name: tx_isolation # |
2743 | |
2744 | === modified file 'Percona-Server/mysys/CMakeLists.txt' |
2745 | --- Percona-Server/mysys/CMakeLists.txt 2013-08-02 09:40:55 +0000 |
2746 | +++ Percona-Server/mysys/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
2747 | @@ -77,3 +77,8 @@ |
2748 | ADD_EXECUTABLE(thr_lock thr_lock.c) |
2749 | TARGET_LINK_LIBRARIES(thr_lock mysys) |
2750 | SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN") |
2751 | + |
2752 | +INSTALL_DEBUG_SYMBOLS(mysys) |
2753 | +IF(MSVC) |
2754 | + INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug) |
2755 | +ENDIF() |
2756 | |
2757 | === modified file 'Percona-Server/mysys/mf_iocache2.c' |
2758 | --- Percona-Server/mysys/mf_iocache2.c 2013-06-27 15:35:20 +0000 |
2759 | +++ Percona-Server/mysys/mf_iocache2.c 2013-12-05 18:48:48 +0000 |
2760 | @@ -419,7 +419,7 @@ |
2761 | { |
2762 | register int iarg; |
2763 | size_t length2; |
2764 | - char buff[17]; |
2765 | + char buff[32]; |
2766 | |
2767 | iarg = va_arg(args, int); |
2768 | if (*fmt == 'd') |
2769 | @@ -454,7 +454,7 @@ |
2770 | { |
2771 | register long iarg; |
2772 | size_t length2; |
2773 | - char buff[17]; |
2774 | + char buff[32]; |
2775 | |
2776 | iarg = va_arg(args, long); |
2777 | if (*++fmt == 'd') |
2778 | |
2779 | === modified file 'Percona-Server/packaging/WiX/mysql_server.wxs.in' |
2780 | --- Percona-Server/packaging/WiX/mysql_server.wxs.in 2013-02-20 11:41:43 +0000 |
2781 | +++ Percona-Server/packaging/WiX/mysql_server.wxs.in 2013-12-05 18:48:48 +0000 |
2782 | @@ -70,10 +70,10 @@ |
2783 | Installed |
2784 | </Custom> |
2785 | </InstallExecuteSequence> |
2786 | - <InstallUISequence> |
2787 | + <InstallUISequence> |
2788 | <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts --> |
2789 | <AppSearch After="FindRelatedProducts"/> |
2790 | - </InstallUISequence> |
2791 | + </InstallUISequence> |
2792 | |
2793 | <!-- Find previous installation --> |
2794 | <Property Id="INSTALLDIR"> |
2795 | @@ -83,31 +83,43 @@ |
2796 | Name="InstallLocation" |
2797 | Type="raw" /> |
2798 | </Property> |
2799 | - <Property Id="OLDERVERSION"> |
2800 | - <RegistrySearch Id="FindOlderVersion" |
2801 | - Root="HKLM" |
2802 | - Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]" |
2803 | - Name="DisplayVersion" |
2804 | - Type="raw" /> |
2805 | - </Property> |
2806 | - <Property Id="DATADIR"> |
2807 | + <?if @Platform@ != "x64" ?> |
2808 | + <Property Id="OLDERVERSION"> |
2809 | + <RegistrySearch Id="FindOlderVersion" |
2810 | + Root="HKLM" |
2811 | + Win64 = "no" |
2812 | + Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]" |
2813 | + Name="DisplayVersion" |
2814 | + Type="raw" /> |
2815 | + </Property> |
2816 | + <?else ?> |
2817 | + <Property Id="OLDERVERSION"> |
2818 | + <RegistrySearch Id="FindOlderVersion" |
2819 | + Root="HKLM" |
2820 | + Win64 = "yes" |
2821 | + Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]" |
2822 | + Name="DisplayVersion" |
2823 | + Type="raw" /> |
2824 | + </Property> |
2825 | + <?endif ?> |
2826 | + <Property Id="DATADIR"> |
2827 | <RegistrySearch Id="FindDataDir" |
2828 | Root="HKLM" |
2829 | Key="SOFTWARE\MySQL AB\[ProductName]" |
2830 | Name="DataLocation" |
2831 | Type="raw" /> |
2832 | </Property> |
2833 | - <Property Id="INSTALLDIR2"> |
2834 | + <Property Id="INSTALLDIR2"> |
2835 | <RegistrySearch Id="FindInstallLocation2" |
2836 | Root="HKLM" |
2837 | Key="SOFTWARE\MySQL AB\[ProductName]" |
2838 | Name="Location" |
2839 | Type="raw" /> |
2840 | </Property> |
2841 | - <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> |
2842 | - <InstallUISequence> |
2843 | - <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> |
2844 | - </InstallUISequence> |
2845 | + <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> |
2846 | + <InstallUISequence> |
2847 | + <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> |
2848 | + </InstallUISequence> |
2849 | |
2850 | |
2851 | <!-- UI --> |
2852 | |
2853 | === modified file 'Percona-Server/packaging/rpm-uln/mysql.spec.sh' |
2854 | --- Percona-Server/packaging/rpm-uln/mysql.spec.sh 2013-07-09 18:35:26 +0000 |
2855 | +++ Percona-Server/packaging/rpm-uln/mysql.spec.sh 2013-12-05 18:48:48 +0000 |
2856 | @@ -858,7 +858,9 @@ |
2857 | %files -n mysql-server%{product_suffix} -f release/support-files/plugins.files |
2858 | %defattr(-,root,root) |
2859 | %doc release/support-files/*.cnf |
2860 | -%doc %{_datadir}/info/mysql.info* |
2861 | +%if 0%{?commercial} |
2862 | + %doc %{_datadir}/info/mysql.info* |
2863 | +%endif |
2864 | %doc %{src_dir}/Docs/ChangeLog |
2865 | %doc %{src_dir}/Docs/INFO_SRC* |
2866 | %doc release/Docs/INFO_BIN* |
2867 | @@ -981,6 +983,9 @@ |
2868 | %{_mandir}/man1/mysql_client_test.1* |
2869 | |
2870 | %changelog |
2871 | +* Tue Nov 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> |
2872 | +- Removed non gpl file mysql.info from community packages |
2873 | + |
2874 | * Wed Jul 10 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> |
2875 | - Removed directory /usr/share/mysql/solaris/postinstall-solaris to resolve build |
2876 | error |
2877 | |
2878 | === modified file 'Percona-Server/plugin/semisync/semisync_master.cc' |
2879 | --- Percona-Server/plugin/semisync/semisync_master.cc 2011-09-08 10:10:26 +0000 |
2880 | +++ Percona-Server/plugin/semisync/semisync_master.cc 2013-12-05 18:48:48 +0000 |
2881 | @@ -482,13 +482,17 @@ |
2882 | lock(); |
2883 | rpl_semi_sync_master_clients--; |
2884 | |
2885 | - /* If user has chosen not to wait if no semi-sync slave available |
2886 | - and the last semi-sync slave exits, turn off semi-sync on master |
2887 | - immediately. |
2888 | - */ |
2889 | - if (!rpl_semi_sync_master_wait_no_slave && |
2890 | - rpl_semi_sync_master_clients == 0) |
2891 | - switch_off(); |
2892 | + /* Only switch off if semi-sync is enabled and is on */ |
2893 | + if (getMasterEnabled() && is_on()) |
2894 | + { |
2895 | + /* If user has chosen not to wait if no semi-sync slave available |
2896 | + and the last semi-sync slave exits, turn off semi-sync on master |
2897 | + immediately. |
2898 | + */ |
2899 | + if (!rpl_semi_sync_master_wait_no_slave && |
2900 | + rpl_semi_sync_master_clients == 0) |
2901 | + switch_off(); |
2902 | + } |
2903 | unlock(); |
2904 | } |
2905 | |
2906 | @@ -752,7 +756,8 @@ |
2907 | At this point, the binlog file and position of this transaction |
2908 | must have been removed from ActiveTranx. |
2909 | */ |
2910 | - assert(!active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name, |
2911 | + assert(!getMasterEnabled() || |
2912 | + !active_tranxs_->is_tranx_end_pos(trx_wait_binlog_name, |
2913 | trx_wait_binlog_pos)); |
2914 | |
2915 | /* Update the status counter. */ |
2916 | @@ -893,10 +898,7 @@ |
2917 | * target, do not request replies from the slave. |
2918 | */ |
2919 | if (!getMasterEnabled() || !is_semi_sync_slave()) |
2920 | - { |
2921 | - sync = false; |
2922 | return 0; |
2923 | - } |
2924 | |
2925 | function_enter(kWho); |
2926 | |
2927 | @@ -904,15 +906,12 @@ |
2928 | |
2929 | /* This is the real check inside the mutex. */ |
2930 | if (!getMasterEnabled()) |
2931 | - { |
2932 | - sync = false; |
2933 | - goto l_end; |
2934 | - } |
2935 | + goto l_end; // sync= false at this point in time |
2936 | |
2937 | if (is_on()) |
2938 | { |
2939 | /* semi-sync is ON */ |
2940 | - sync = false; /* No sync unless a transaction is involved. */ |
2941 | + /* sync= false; No sync unless a transaction is involved. */ |
2942 | |
2943 | if (reply_file_name_inited_) |
2944 | { |
2945 | |
2946 | === modified file 'Percona-Server/scripts/CMakeLists.txt' |
2947 | --- Percona-Server/scripts/CMakeLists.txt 2013-02-26 05:35:17 +0000 |
2948 | +++ Percona-Server/scripts/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
2949 | @@ -216,7 +216,6 @@ |
2950 | COMPONENT Server |
2951 | ) |
2952 | |
2953 | - |
2954 | SET(prefix "${CMAKE_INSTALL_PREFIX}") |
2955 | SET(sysconfdir ${prefix}) |
2956 | SET(bindir ${prefix}/${INSTALL_BINDIR}) |
2957 | |
2958 | === modified file 'Percona-Server/scripts/mysql_system_tables_data.sql' |
2959 | --- Percona-Server/scripts/mysql_system_tables_data.sql 2013-02-19 09:06:30 +0000 |
2960 | +++ Percona-Server/scripts/mysql_system_tables_data.sql 2013-12-05 18:48:48 +0000 |
2961 | @@ -24,8 +24,7 @@ |
2962 | -- Get the hostname, if the hostname has any wildcard character like "_" or "%" |
2963 | -- add escape character in front of wildcard character to convert "_" or "%" to |
2964 | -- a plain character |
2965 | -SET @get_hostname= @@hostname; |
2966 | -SELECT REPLACE((SELECT REPLACE(@get_hostname,'_','\_')),'%','\%') INTO @current_hostname; |
2967 | +SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname; |
2968 | |
2969 | |
2970 | -- Fill "db" table with default grants for anyone to |
2971 | @@ -41,11 +40,11 @@ |
2972 | -- from local machine if "user" table didn't exist before |
2973 | CREATE TEMPORARY TABLE tmp_user LIKE user; |
2974 | INSERT 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,'',''); |
2975 | -REPLACE 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'; |
2976 | +REPLACE 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'; |
2977 | REPLACE 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,'',''); |
2978 | REPLACE 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,'',''); |
2979 | INSERT INTO tmp_user (host,user) VALUES ('localhost',''); |
2980 | -INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost'; |
2981 | +INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost'; |
2982 | INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; |
2983 | DROP TABLE tmp_user; |
2984 | |
2985 | |
2986 | === modified file 'Percona-Server/scripts/mysql_system_tables_fix.sql' |
2987 | --- Percona-Server/scripts/mysql_system_tables_fix.sql 2011-06-30 15:46:53 +0000 |
2988 | +++ Percona-Server/scripts/mysql_system_tables_fix.sql 2013-12-05 18:48:48 +0000 |
2989 | @@ -652,6 +652,8 @@ |
2990 | INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0; |
2991 | DROP TABLE tmp_proxies_priv; |
2992 | |
2993 | +# Convering the host name to lower case for existing users |
2994 | +UPDATE user SET host=LOWER( host ) WHERE LOWER( host ) <> host; |
2995 | |
2996 | # Activate the new, possible modified privilege tables |
2997 | # This should not be needed, but gives us some extra testing that the above |
2998 | |
2999 | === modified file 'Percona-Server/sql-common/client.c' |
3000 | --- Percona-Server/sql-common/client.c 2013-06-26 07:01:13 +0000 |
3001 | +++ Percona-Server/sql-common/client.c 2013-12-05 18:48:48 +0000 |
3002 | @@ -4151,6 +4151,7 @@ |
3003 | mysql->options.methods_to_use= option; |
3004 | break; |
3005 | case MYSQL_SET_CLIENT_IP: |
3006 | + my_free(mysql->options.client_ip); |
3007 | mysql->options.client_ip= my_strdup(arg, MYF(MY_WME)); |
3008 | break; |
3009 | case MYSQL_SECURE_AUTH: |
3010 | |
3011 | === modified file 'Percona-Server/sql/filesort.cc' |
3012 | --- Percona-Server/sql/filesort.cc 2013-06-26 07:01:13 +0000 |
3013 | +++ Percona-Server/sql/filesort.cc 2013-12-05 18:48:48 +0000 |
3014 | @@ -1,4 +1,5 @@ |
3015 | -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. |
3016 | +/* |
3017 | + Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
3018 | |
3019 | This program is free software; you can redistribute it and/or modify |
3020 | it under the terms of the GNU General Public License as published by |
3021 | @@ -201,7 +202,8 @@ |
3022 | |
3023 | { |
3024 | const ulong min_sort_memory= |
3025 | - max(MIN_SORT_MEMORY, param.sort_length * MERGEBUFF2); |
3026 | + max(MIN_SORT_MEMORY, |
3027 | + ALIGN_SIZE(MERGEBUFF2 * (param.rec_length + sizeof(uchar*)))); |
3028 | while (memory_available >= min_sort_memory) |
3029 | { |
3030 | ulong keys= memory_available / (param.rec_length + sizeof(char*)); |
3031 | @@ -342,7 +344,10 @@ |
3032 | "%s: %s", |
3033 | MYF(ME_ERROR + ME_WAITTANG), |
3034 | ER_THD(thd, ER_FILSORT_ABORT), |
3035 | - kill_errno ? ER(kill_errno) : thd->stmt_da->message()); |
3036 | + kill_errno ? ((kill_errno == THD::KILL_CONNECTION && |
3037 | + !shutdown_in_progress) ? ER(THD::KILL_QUERY) : |
3038 | + ER(kill_errno)) : |
3039 | + thd->stmt_da->message()); |
3040 | |
3041 | if (global_system_variables.log_warnings > 1) |
3042 | { |
3043 | |
3044 | === modified file 'Percona-Server/sql/ha_partition.cc' |
3045 | --- Percona-Server/sql/ha_partition.cc 2013-07-29 06:11:13 +0000 |
3046 | +++ Percona-Server/sql/ha_partition.cc 2013-12-05 18:48:48 +0000 |
3047 | @@ -1337,7 +1337,8 @@ |
3048 | int ha_partition::prepare_new_partition(TABLE *tbl, |
3049 | HA_CREATE_INFO *create_info, |
3050 | handler *file, const char *part_name, |
3051 | - partition_element *p_elem) |
3052 | + partition_element *p_elem, |
3053 | + uint disable_non_uniq_indexes) |
3054 | { |
3055 | int error; |
3056 | DBUG_ENTER("prepare_new_partition"); |
3057 | @@ -1362,6 +1363,7 @@ |
3058 | if ((error= file->ha_open(tbl, part_name, m_mode, m_open_test_lock))) |
3059 | goto error_open; |
3060 | DBUG_PRINT("info", ("partition %s opened", part_name)); |
3061 | + |
3062 | /* |
3063 | Note: if you plan to add another call that may return failure, |
3064 | better to do it before external_lock() as cleanup_new_partition() |
3065 | @@ -1372,6 +1374,9 @@ |
3066 | goto error_external_lock; |
3067 | DBUG_PRINT("info", ("partition %s external locked", part_name)); |
3068 | |
3069 | + if (disable_non_uniq_indexes) |
3070 | + file->ha_disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE); |
3071 | + |
3072 | DBUG_RETURN(0); |
3073 | error_external_lock: |
3074 | (void) file->close(); |
3075 | @@ -1649,6 +1654,14 @@ |
3076 | on them to prepare them for copy phase and also for later close |
3077 | calls |
3078 | */ |
3079 | + |
3080 | + /* |
3081 | + Before creating new partitions check whether indexes are disabled |
3082 | + in the partitions. |
3083 | + */ |
3084 | + |
3085 | + uint disable_non_uniq_indexes = indexes_are_disabled(); |
3086 | + |
3087 | i= 0; |
3088 | part_count= 0; |
3089 | part_it.rewind(); |
3090 | @@ -1683,11 +1696,13 @@ |
3091 | if ((error= prepare_new_partition(table, create_info, |
3092 | new_file_array[part], |
3093 | (const char *)part_name_buff, |
3094 | - sub_elem))) |
3095 | + sub_elem, |
3096 | + disable_non_uniq_indexes))) |
3097 | { |
3098 | cleanup_new_partition(part_count); |
3099 | DBUG_RETURN(error); |
3100 | } |
3101 | + |
3102 | m_added_file[part_count++]= new_file_array[part]; |
3103 | } while (++j < num_subparts); |
3104 | } |
3105 | @@ -1700,11 +1715,13 @@ |
3106 | if ((error= prepare_new_partition(table, create_info, |
3107 | new_file_array[i], |
3108 | (const char *)part_name_buff, |
3109 | - part_elem))) |
3110 | + part_elem, |
3111 | + disable_non_uniq_indexes))) |
3112 | { |
3113 | cleanup_new_partition(part_count); |
3114 | DBUG_RETURN(error); |
3115 | } |
3116 | + |
3117 | m_added_file[part_count++]= new_file_array[i]; |
3118 | } |
3119 | } |
3120 | |
3121 | === modified file 'Percona-Server/sql/ha_partition.h' |
3122 | --- Percona-Server/sql/ha_partition.h 2013-06-14 05:58:29 +0000 |
3123 | +++ Percona-Server/sql/ha_partition.h 2013-12-05 18:48:48 +0000 |
3124 | @@ -270,7 +270,8 @@ |
3125 | void cleanup_new_partition(uint part_count); |
3126 | int prepare_new_partition(TABLE *table, HA_CREATE_INFO *create_info, |
3127 | handler *file, const char *part_name, |
3128 | - partition_element *p_elem); |
3129 | + partition_element *p_elem, |
3130 | + uint disable_non_uniq_indexes); |
3131 | /* |
3132 | delete_table, rename_table and create uses very similar logic which |
3133 | is packed into this routine. |
3134 | |
3135 | === modified file 'Percona-Server/sql/handler.cc' |
3136 | --- Percona-Server/sql/handler.cc 2013-10-22 13:33:14 +0000 |
3137 | +++ Percona-Server/sql/handler.cc 2013-12-05 18:48:48 +0000 |
3138 | @@ -5135,8 +5135,14 @@ |
3139 | "", 0, "DISABLED", 8) ? 1 : 0; |
3140 | } |
3141 | else |
3142 | + { |
3143 | + DBUG_EXECUTE_IF("simulate_show_status_failure", |
3144 | + DBUG_SET("+d,simulate_net_write_failure");); |
3145 | result= db_type->show_status && |
3146 | db_type->show_status(db_type, thd, stat_print, stat) ? 1 : 0; |
3147 | + DBUG_EXECUTE_IF("simulate_show_status_failure", |
3148 | + DBUG_SET("-d,simulate_net_write_failure");); |
3149 | + } |
3150 | } |
3151 | |
3152 | if (!result) |
3153 | |
3154 | === modified file 'Percona-Server/sql/item_strfunc.cc' |
3155 | --- Percona-Server/sql/item_strfunc.cc 2013-02-26 05:35:17 +0000 |
3156 | +++ Percona-Server/sql/item_strfunc.cc 2013-12-05 18:48:48 +0000 |
3157 | @@ -1,5 +1,5 @@ |
3158 | /* |
3159 | - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. |
3160 | + Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
3161 | |
3162 | This program is free software; you can redistribute it and/or modify |
3163 | it under the terms of the GNU General Public License as published by |
3164 | @@ -2928,7 +2928,9 @@ |
3165 | int to_base= (int) args[2]->val_int(); |
3166 | int err; |
3167 | |
3168 | + // Note that abs(INT_MIN) is undefined. |
3169 | if (args[0]->null_value || args[1]->null_value || args[2]->null_value || |
3170 | + from_base == INT_MIN || to_base == INT_MIN || |
3171 | abs(to_base) > 36 || abs(to_base) < 2 || |
3172 | abs(from_base) > 36 || abs(from_base) < 2 || !(res->length())) |
3173 | { |
3174 | |
3175 | === modified file 'Percona-Server/sql/item_sum.cc' |
3176 | --- Percona-Server/sql/item_sum.cc 2013-04-14 02:39:56 +0000 |
3177 | +++ Percona-Server/sql/item_sum.cc 2013-12-05 18:48:48 +0000 |
3178 | @@ -1496,8 +1496,12 @@ |
3179 | |
3180 | bool Item_sum_count::add() |
3181 | { |
3182 | - if (!args[0]->maybe_null || !args[0]->is_null()) |
3183 | - count++; |
3184 | + for (uint i=0; i<arg_count; i++) |
3185 | + { |
3186 | + if (args[i]->maybe_null && args[i]->is_null()) |
3187 | + return 0; |
3188 | + } |
3189 | + count++; |
3190 | return 0; |
3191 | } |
3192 | |
3193 | |
3194 | === modified file 'Percona-Server/sql/log_event.cc' |
3195 | --- Percona-Server/sql/log_event.cc 2013-10-22 13:33:14 +0000 |
3196 | +++ Percona-Server/sql/log_event.cc 2013-12-05 18:48:48 +0000 |
3197 | @@ -5511,7 +5511,6 @@ |
3198 | |
3199 | switch (type) { |
3200 | case LAST_INSERT_ID_EVENT: |
3201 | - thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 1; |
3202 | thd->first_successful_insert_id_in_prev_stmt= val; |
3203 | break; |
3204 | case INSERT_ID_EVENT: |
3205 | |
3206 | === modified file 'Percona-Server/sql/net_serv.cc' |
3207 | --- Percona-Server/sql/net_serv.cc 2013-06-27 15:35:20 +0000 |
3208 | +++ Percona-Server/sql/net_serv.cc 2013-12-05 18:48:48 +0000 |
3209 | @@ -1,4 +1,4 @@ |
3210 | -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. |
3211 | +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
3212 | |
3213 | This program is free software; you can redistribute it and/or modify |
3214 | it under the terms of the GNU General Public License as published by |
3215 | @@ -370,6 +370,12 @@ |
3216 | |
3217 | MYSQL_NET_WRITE_START(len); |
3218 | |
3219 | + DBUG_EXECUTE_IF("simulate_net_write_failure", { |
3220 | + my_error(ER_NET_ERROR_ON_WRITE, MYF(0)); |
3221 | + return 1; |
3222 | + }; |
3223 | + ); |
3224 | + |
3225 | /* |
3226 | Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH |
3227 | length. The last packet is always a packet that is < MAX_PACKET_LENGTH. |
3228 | |
3229 | === modified file 'Percona-Server/sql/opt_range.cc' |
3230 | --- Percona-Server/sql/opt_range.cc 2013-08-14 03:52:04 +0000 |
3231 | +++ Percona-Server/sql/opt_range.cc 2013-12-05 18:48:48 +0000 |
3232 | @@ -8071,15 +8071,16 @@ |
3233 | { |
3234 | KEY *table_key=quick->head->key_info+quick->index; |
3235 | flag=EQ_RANGE; |
3236 | - if ((table_key->flags & HA_NOSAME) && key->part == table_key->key_parts-1) |
3237 | + if ((table_key->flags & HA_NOSAME) && |
3238 | + key_tree->part == table_key->key_parts-1) |
3239 | { |
3240 | - if (!(table_key->flags & HA_NULL_PART_KEY) || |
3241 | - !null_part_in_key(key, |
3242 | - param->min_key, |
3243 | - (uint) (tmp_min_key - param->min_key))) |
3244 | - flag|= UNIQUE_RANGE; |
3245 | - else |
3246 | - flag|= NULL_RANGE; |
3247 | + if ((table_key->flags & HA_NULL_PART_KEY) && |
3248 | + null_part_in_key(key, |
3249 | + param->min_key, |
3250 | + (uint) (tmp_min_key - param->min_key))) |
3251 | + flag|= NULL_RANGE; |
3252 | + else |
3253 | + flag|= UNIQUE_RANGE; |
3254 | } |
3255 | } |
3256 | } |
3257 | @@ -8109,7 +8110,7 @@ |
3258 | } |
3259 | |
3260 | /* |
3261 | - Return 1 if there is only one range and this uses the whole primary key |
3262 | + Return 1 if there is only one range and this uses the whole unique key |
3263 | */ |
3264 | |
3265 | bool QUICK_RANGE_SELECT::unique_key_range() |
3266 | |
3267 | === modified file 'Percona-Server/sql/set_var.cc' |
3268 | --- Percona-Server/sql/set_var.cc 2013-10-22 13:33:14 +0000 |
3269 | +++ Percona-Server/sql/set_var.cc 2013-12-05 18:48:48 +0000 |
3270 | @@ -217,7 +217,6 @@ |
3271 | |
3272 | bool sys_var::check(THD *thd, set_var *var) |
3273 | { |
3274 | - do_deprecated_warning(thd); |
3275 | if ((var->value && do_check(thd, var)) |
3276 | || (on_check && on_check(this, thd, var))) |
3277 | { |
3278 | @@ -599,6 +598,7 @@ |
3279 | |
3280 | int set_var::check(THD *thd) |
3281 | { |
3282 | + var->do_deprecated_warning(thd); |
3283 | if (var->is_readonly()) |
3284 | { |
3285 | my_error(ER_INCORRECT_GLOBAL_LOCAL_VAR, MYF(0), var->name.str, "read only"); |
3286 | |
3287 | === modified file 'Percona-Server/sql/set_var.h' |
3288 | --- Percona-Server/sql/set_var.h 2013-06-27 15:35:20 +0000 |
3289 | +++ Percona-Server/sql/set_var.h 2013-12-05 18:48:48 +0000 |
3290 | @@ -151,6 +151,7 @@ |
3291 | return (option.id != -1) && (m_parse_flag & parse_flags) && |
3292 | insert_dynamic(array, (uchar*)&option); |
3293 | } |
3294 | + void do_deprecated_warning(THD *thd); |
3295 | |
3296 | private: |
3297 | virtual bool do_check(THD *thd, set_var *var) = 0; |
3298 | @@ -164,7 +165,7 @@ |
3299 | virtual void global_save_default(THD *thd, set_var *var) = 0; |
3300 | virtual bool session_update(THD *thd, set_var *var) = 0; |
3301 | virtual bool global_update(THD *thd, set_var *var) = 0; |
3302 | - void do_deprecated_warning(THD *thd); |
3303 | + |
3304 | protected: |
3305 | /** |
3306 | A pointer to a value of the variable for SHOW. |
3307 | |
3308 | === modified file 'Percona-Server/sql/sql_acl.cc' |
3309 | --- Percona-Server/sql/sql_acl.cc 2013-10-22 13:33:14 +0000 |
3310 | +++ Percona-Server/sql/sql_acl.cc 2013-12-05 18:48:48 +0000 |
3311 | @@ -1818,7 +1818,8 @@ |
3312 | |
3313 | copy_length= (size_t) (strlen(ip ? ip : "") + |
3314 | strlen(user ? user : "") + |
3315 | - strlen(db ? db : "")); |
3316 | + strlen(db ? db : "")) + 2; /* Added 2 at the end to avoid |
3317 | + buffer overflow at strmov()*/ |
3318 | /* |
3319 | Make sure that strmov() operations do not result in buffer overflow. |
3320 | */ |
3321 | @@ -5218,7 +5219,8 @@ |
3322 | size_t copy_length; |
3323 | |
3324 | copy_length= (size_t) (strlen(sctx->priv_user ? sctx->priv_user : "") + |
3325 | - strlen(db ? db : "")); |
3326 | + strlen(db ? db : "")) + 1; /* Added 1 at the end to avoid |
3327 | + buffer overflow at strmov()*/ |
3328 | |
3329 | /* |
3330 | Make sure that strmov() operations do not result in buffer overflow. |
3331 | |
3332 | === modified file 'Percona-Server/sql/sql_class.h' |
3333 | --- Percona-Server/sql/sql_class.h 2013-12-03 05:52:35 +0000 |
3334 | +++ Percona-Server/sql/sql_class.h 2013-12-05 18:48:48 +0000 |
3335 | @@ -3699,11 +3699,13 @@ |
3336 | bool get(TABLE *table); |
3337 | static double get_use_cost(uint *buffer, uint nkeys, uint key_size, |
3338 | ulonglong max_in_memory_size); |
3339 | + |
3340 | + // Returns the number of bytes needed in imerge_cost_buf. |
3341 | inline static int get_cost_calc_buff_size(ulong nkeys, uint key_size, |
3342 | ulonglong max_in_memory_size) |
3343 | { |
3344 | register ulonglong max_elems_in_tree= |
3345 | - (1 + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size)); |
3346 | + (max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size)); |
3347 | return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree)); |
3348 | } |
3349 | |
3350 | |
3351 | === modified file 'Percona-Server/sql/sql_lex.cc' |
3352 | --- Percona-Server/sql/sql_lex.cc 2013-08-02 09:40:55 +0000 |
3353 | +++ Percona-Server/sql/sql_lex.cc 2013-12-05 18:48:48 +0000 |
3354 | @@ -412,6 +412,7 @@ |
3355 | lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc; |
3356 | lex->select_lex.group_list.empty(); |
3357 | lex->select_lex.order_list.empty(); |
3358 | + lex->select_lex.gorder_list.empty(); |
3359 | lex->duplicates= DUP_ERROR; |
3360 | lex->ignore= 0; |
3361 | lex->spname= NULL; |
3362 | |
3363 | === modified file 'Percona-Server/sql/sql_partition.cc' |
3364 | --- Percona-Server/sql/sql_partition.cc 2013-10-22 13:33:14 +0000 |
3365 | +++ Percona-Server/sql/sql_partition.cc 2013-12-05 18:48:48 +0000 |
3366 | @@ -5183,6 +5183,8 @@ |
3367 | } |
3368 | else if (alter_info->flags & ALTER_REBUILD_PARTITION) |
3369 | { |
3370 | + set_engine_all_partitions(tab_part_info, |
3371 | + tab_part_info->default_engine_type); |
3372 | if (set_part_state(alter_info, tab_part_info, PART_CHANGED)) |
3373 | { |
3374 | my_error(ER_DROP_PARTITION_NON_EXISTENT, MYF(0), "REBUILD"); |
3375 | |
3376 | === modified file 'Percona-Server/sql/sql_prepare.cc' |
3377 | --- Percona-Server/sql/sql_prepare.cc 2013-10-22 13:33:14 +0000 |
3378 | +++ Percona-Server/sql/sql_prepare.cc 2013-12-05 18:48:48 +0000 |
3379 | @@ -880,7 +880,7 @@ |
3380 | if (param->state == Item_param::NO_VALUE) |
3381 | DBUG_RETURN(1); |
3382 | |
3383 | - if (param->limit_clause_param && param->item_type != Item::INT_ITEM) |
3384 | + if (param->limit_clause_param && param->state != Item_param::INT_VALUE) |
3385 | { |
3386 | param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS); |
3387 | param->item_type= Item::INT_ITEM; |
3388 | |
3389 | === modified file 'Percona-Server/sql/sys_vars.cc' |
3390 | --- Percona-Server/sql/sys_vars.cc 2013-12-03 05:52:35 +0000 |
3391 | +++ Percona-Server/sql/sys_vars.cc 2013-12-05 18:48:48 +0000 |
3392 | @@ -1,4 +1,4 @@ |
3393 | -/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. |
3394 | +/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. |
3395 | |
3396 | This program is free software; you can redistribute it and/or modify |
3397 | it under the terms of the GNU General Public License as published by |
3398 | @@ -1879,9 +1879,13 @@ |
3399 | static Sys_var_ulong Sys_thread_concurrency( |
3400 | "thread_concurrency", |
3401 | "Permits the application to give the threads system a hint for " |
3402 | - "the desired number of threads that should be run at the same time", |
3403 | + "the desired number of threads that should be run at the same time." |
3404 | + "This variable has no effect, and is deprecated. " |
3405 | + "It will be removed in a future release.", |
3406 | READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG), |
3407 | - VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1)); |
3408 | + VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1), |
3409 | + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), |
3410 | + DEPRECATED("")); |
3411 | |
3412 | static Sys_var_ulong Sys_thread_stack( |
3413 | "thread_stack", "The stack size for each thread", |
3414 | |
3415 | === modified file 'Percona-Server/storage/innobase/btr/btr0cur.c' |
3416 | --- Percona-Server/storage/innobase/btr/btr0cur.c 2013-10-22 13:33:14 +0000 |
3417 | +++ Percona-Server/storage/innobase/btr/btr0cur.c 2013-12-05 18:48:48 +0000 |
3418 | @@ -61,6 +61,7 @@ |
3419 | #include "row0upd.h" |
3420 | #include "trx0rec.h" |
3421 | #include "trx0roll.h" /* trx_is_recv() */ |
3422 | +#include "trx0undo.h" |
3423 | #include "que0que.h" |
3424 | #include "row0row.h" |
3425 | #include "srv0srv.h" |
3426 | @@ -1757,7 +1758,7 @@ |
3427 | |
3428 | /***********************************************************//** |
3429 | Writes a redo log record of updating a record in-place. */ |
3430 | -UNIV_INLINE |
3431 | +UNIV_INTERN |
3432 | void |
3433 | btr_cur_update_in_place_log( |
3434 | /*========================*/ |
3435 | @@ -1785,18 +1786,30 @@ |
3436 | return; |
3437 | } |
3438 | |
3439 | - /* The code below assumes index is a clustered index: change index to |
3440 | - the clustered index if we are updating a secondary index record (or we |
3441 | - could as well skip writing the sys col values to the log in this case |
3442 | - because they are not needed for a secondary index record update) */ |
3443 | - |
3444 | - index = dict_table_get_first_index(index->table); |
3445 | + /* For secondary indexes, we could skip writing the dummy system fields |
3446 | + to the redo log but we have to change redo log parsing of |
3447 | + MLOG_REC_UPDATE_IN_PLACE/MLOG_COMP_REC_UPDATE_IN_PLACE or we have to add |
3448 | + new redo log record. For now, just write dummy sys fields to the redo |
3449 | + log if we are updating a secondary index record. |
3450 | + */ |
3451 | |
3452 | mach_write_to_1(log_ptr, flags); |
3453 | log_ptr++; |
3454 | |
3455 | - log_ptr = row_upd_write_sys_vals_to_log(index, trx, roll_ptr, log_ptr, |
3456 | - mtr); |
3457 | + if (dict_index_is_clust(index)) { |
3458 | + log_ptr = row_upd_write_sys_vals_to_log( |
3459 | + index, trx, roll_ptr, log_ptr, mtr); |
3460 | + } else { |
3461 | + /* Dummy system fields for a secondary index */ |
3462 | + /* TRX_ID Position */ |
3463 | + log_ptr += mach_write_compressed(log_ptr, 0); |
3464 | + /* ROLL_PTR */ |
3465 | + trx_write_roll_ptr(log_ptr, 0); |
3466 | + log_ptr += DATA_ROLL_PTR_LEN; |
3467 | + /* TRX_ID */ |
3468 | + log_ptr += mach_ull_write_compressed(log_ptr, 0); |
3469 | + } |
3470 | + |
3471 | mach_write_to_2(log_ptr, page_offset(rec)); |
3472 | log_ptr += 2; |
3473 | |
3474 | |
3475 | === modified file 'Percona-Server/storage/innobase/btr/btr0pcur.c' |
3476 | --- Percona-Server/storage/innobase/btr/btr0pcur.c 2013-08-14 03:52:04 +0000 |
3477 | +++ Percona-Server/storage/innobase/btr/btr0pcur.c 2013-12-05 18:48:48 +0000 |
3478 | @@ -1,6 +1,6 @@ |
3479 | /***************************************************************************** |
3480 | |
3481 | -Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. |
3482 | +Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. |
3483 | |
3484 | This program is free software; you can redistribute it and/or modify it under |
3485 | the terms of the GNU General Public License as published by the Free Software |
3486 | @@ -111,7 +111,7 @@ |
3487 | page_t* page; |
3488 | ulint offs; |
3489 | |
3490 | - ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED); |
3491 | + ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED); |
3492 | ut_ad(cursor->latch_mode != BTR_NO_LATCHES); |
3493 | |
3494 | block = btr_pcur_get_block(cursor); |
3495 | @@ -128,7 +128,6 @@ |
3496 | |
3497 | ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX) |
3498 | || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); |
3499 | - ut_a(cursor->latch_mode != BTR_NO_LATCHES); |
3500 | |
3501 | if (UNIV_UNLIKELY(page_get_n_recs(page) == 0)) { |
3502 | /* It must be an empty index tree; NOTE that in this case |
3503 | @@ -239,21 +238,12 @@ |
3504 | |
3505 | ut_ad(mtr); |
3506 | ut_ad(mtr->state == MTR_ACTIVE); |
3507 | + ut_ad(cursor->old_stored == BTR_PCUR_OLD_STORED); |
3508 | + ut_ad(cursor->pos_state == BTR_PCUR_WAS_POSITIONED |
3509 | + || cursor->pos_state == BTR_PCUR_IS_POSITIONED); |
3510 | |
3511 | index = btr_cur_get_index(btr_pcur_get_btr_cur(cursor)); |
3512 | |
3513 | - if (UNIV_UNLIKELY(cursor->old_stored != BTR_PCUR_OLD_STORED) |
3514 | - || UNIV_UNLIKELY(cursor->pos_state != BTR_PCUR_WAS_POSITIONED |
3515 | - && cursor->pos_state != BTR_PCUR_IS_POSITIONED)) { |
3516 | - ut_print_buf(stderr, cursor, sizeof(btr_pcur_t)); |
3517 | - putc('\n', stderr); |
3518 | - if (cursor->trx_if_known) { |
3519 | - trx_print(stderr, cursor->trx_if_known, 0); |
3520 | - } |
3521 | - |
3522 | - ut_error; |
3523 | - } |
3524 | - |
3525 | if (UNIV_UNLIKELY |
3526 | (cursor->rel_pos == BTR_PCUR_AFTER_LAST_IN_TREE |
3527 | || cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE)) { |
3528 | @@ -277,14 +267,14 @@ |
3529 | |
3530 | if (UNIV_LIKELY(latch_mode == BTR_SEARCH_LEAF) |
3531 | || UNIV_LIKELY(latch_mode == BTR_MODIFY_LEAF)) { |
3532 | - /* Try optimistic restoration */ |
3533 | + /* Try optimistic restoration. */ |
3534 | |
3535 | - if (UNIV_LIKELY(buf_page_optimistic_get( |
3536 | - latch_mode, |
3537 | - cursor->block_when_stored, |
3538 | - cursor->modify_clock, |
3539 | - file, line, mtr))) { |
3540 | + if (buf_page_optimistic_get(latch_mode, |
3541 | + cursor->block_when_stored, |
3542 | + cursor->modify_clock, |
3543 | + file, line, mtr)) { |
3544 | cursor->pos_state = BTR_PCUR_IS_POSITIONED; |
3545 | + cursor->latch_mode = latch_mode; |
3546 | |
3547 | buf_block_dbg_add_level( |
3548 | btr_pcur_get_block(cursor), |
3549 | @@ -296,9 +286,6 @@ |
3550 | const rec_t* rec; |
3551 | const ulint* offsets1; |
3552 | const ulint* offsets2; |
3553 | -#endif /* UNIV_DEBUG */ |
3554 | - cursor->latch_mode = latch_mode; |
3555 | -#ifdef UNIV_DEBUG |
3556 | rec = btr_pcur_get_rec(cursor); |
3557 | |
3558 | heap = mem_heap_create(256); |
3559 | @@ -316,7 +303,13 @@ |
3560 | #endif /* UNIV_DEBUG */ |
3561 | return(TRUE); |
3562 | } |
3563 | - |
3564 | + /* This is the same record as stored, |
3565 | + may need to be adjusted for BTR_PCUR_BEFORE/AFTER, |
3566 | + depending on search mode and direction. */ |
3567 | + if (btr_pcur_is_on_user_rec(cursor)) { |
3568 | + cursor->pos_state |
3569 | + = BTR_PCUR_IS_POSITIONED_OPTIMISTIC; |
3570 | + } |
3571 | return(FALSE); |
3572 | } |
3573 | } |
3574 | @@ -418,7 +411,7 @@ |
3575 | buf_block_t* next_block; |
3576 | page_t* next_page; |
3577 | |
3578 | - ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED); |
3579 | + ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED); |
3580 | ut_ad(cursor->latch_mode != BTR_NO_LATCHES); |
3581 | ut_ad(btr_pcur_is_after_last_on_page(cursor)); |
3582 | |
3583 | @@ -484,7 +477,6 @@ |
3584 | ulint latch_mode; |
3585 | ulint latch_mode2; |
3586 | |
3587 | - ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED); |
3588 | ut_ad(cursor->latch_mode != BTR_NO_LATCHES); |
3589 | ut_ad(btr_pcur_is_before_first_on_page(cursor)); |
3590 | ut_ad(!btr_pcur_is_before_first_in_tree(cursor, mtr)); |
3591 | |
3592 | === modified file 'Percona-Server/storage/innobase/dict/dict0dict.c' |
3593 | --- Percona-Server/storage/innobase/dict/dict0dict.c 2013-09-06 13:24:59 +0000 |
3594 | +++ Percona-Server/storage/innobase/dict/dict0dict.c 2013-12-05 18:48:48 +0000 |
3595 | @@ -36,6 +36,11 @@ |
3596 | /** dummy index for ROW_FORMAT=COMPACT supremum and infimum records */ |
3597 | UNIV_INTERN dict_index_t* dict_ind_compact; |
3598 | |
3599 | +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG |
3600 | +/** Flag to control insert buffer debugging. */ |
3601 | +UNIV_INTERN uint ibuf_debug; |
3602 | +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ |
3603 | + |
3604 | #ifndef UNIV_HOTBACKUP |
3605 | #include "buf0buf.h" |
3606 | #include "data0type.h" |
3607 | @@ -4855,6 +4860,8 @@ |
3608 | dict_index_t* index; |
3609 | ulint sum_of_index_sizes = 0; |
3610 | |
3611 | + DBUG_EXECUTE_IF("skip_innodb_statistics", return;); |
3612 | + |
3613 | if (table->ibd_file_missing) { |
3614 | ut_print_timestamp(stderr); |
3615 | fprintf(stderr, |
3616 | @@ -4916,6 +4923,12 @@ |
3617 | continue; |
3618 | } |
3619 | |
3620 | +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG |
3621 | + if (ibuf_debug && !dict_index_is_clust(index)) { |
3622 | + goto fake_statistics; |
3623 | + } |
3624 | +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ |
3625 | + |
3626 | if (UNIV_LIKELY |
3627 | (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE |
3628 | || (srv_force_recovery < SRV_FORCE_NO_LOG_REDO |
3629 | |
3630 | === modified file 'Percona-Server/storage/innobase/fil/fil0fil.c' |
3631 | --- Percona-Server/storage/innobase/fil/fil0fil.c 2013-12-03 05:53:09 +0000 |
3632 | +++ Percona-Server/storage/innobase/fil/fil0fil.c 2013-12-05 18:48:48 +0000 |
3633 | @@ -4369,7 +4369,7 @@ |
3634 | |
3635 | if (check_msg) { |
3636 | fprintf(stderr, |
3637 | - "InnoDB: Error: %s in file %s", |
3638 | + "InnoDB: Error: %s in file %s\n", |
3639 | check_msg, filepath); |
3640 | goto func_exit; |
3641 | } |
3642 | |
3643 | === modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc' |
3644 | --- Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-10-23 08:23:08 +0000 |
3645 | +++ Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-12-05 18:48:48 +0000 |
3646 | @@ -55,6 +55,7 @@ |
3647 | #include <mysql/innodb_priv.h> |
3648 | #include <mysql/psi/psi.h> |
3649 | #include <my_sys.h> |
3650 | +#include <my_check_opt.h> |
3651 | |
3652 | #ifdef MYSQL_SERVER |
3653 | #include <rpl_mi.h> |
3654 | @@ -8810,6 +8811,10 @@ |
3655 | /* There exists possibility of not being able to find requested |
3656 | index due to inconsistency between MySQL and InoDB dictionary info. |
3657 | Necessary message should have been printed in innobase_get_index() */ |
3658 | + if (prebuilt->table->ibd_file_missing) { |
3659 | + n_rows = HA_POS_ERROR; |
3660 | + goto func_exit; |
3661 | + } |
3662 | if (UNIV_UNLIKELY(!index)) { |
3663 | n_rows = HA_POS_ERROR; |
3664 | goto func_exit; |
3665 | @@ -9533,8 +9538,7 @@ |
3666 | ha_innobase::check( |
3667 | /*===============*/ |
3668 | THD* thd, /*!< in: user thread handle */ |
3669 | - HA_CHECK_OPT* check_opt) /*!< in: check options, currently |
3670 | - ignored */ |
3671 | + HA_CHECK_OPT* check_opt) /*!< in: check options */ |
3672 | { |
3673 | dict_index_t* index; |
3674 | ulint n_rows; |
3675 | @@ -9591,11 +9595,6 @@ |
3676 | do additional check */ |
3677 | prebuilt->table->corrupted = FALSE; |
3678 | |
3679 | - /* Enlarge the fatal lock wait timeout during CHECK TABLE. */ |
3680 | - mutex_enter(&kernel_mutex); |
3681 | - srv_fatal_semaphore_wait_threshold += SRV_SEMAPHORE_WAIT_EXTENSION; |
3682 | - mutex_exit(&kernel_mutex); |
3683 | - |
3684 | for (index = dict_table_get_first_index(prebuilt->table); |
3685 | index != NULL; |
3686 | index = dict_table_get_next_index(index)) { |
3687 | @@ -9608,21 +9607,42 @@ |
3688 | |
3689 | /* If this is an index being created, break */ |
3690 | if (*index->name == TEMP_INDEX_PREFIX) { |
3691 | - break; |
3692 | - } else if (!btr_validate_index(index, prebuilt->trx)) { |
3693 | - is_ok = FALSE; |
3694 | - |
3695 | - innobase_format_name( |
3696 | - index_name, sizeof index_name, |
3697 | - prebuilt->index->name, TRUE); |
3698 | - |
3699 | - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, |
3700 | - ER_NOT_KEYFILE, |
3701 | - "InnoDB: The B-tree of" |
3702 | - " index %s is corrupted.", |
3703 | - index_name); |
3704 | continue; |
3705 | } |
3706 | + if (!(check_opt->flags & T_QUICK)) { |
3707 | + /* Enlarge the fatal lock wait timeout during |
3708 | + CHECK TABLE. */ |
3709 | + mutex_enter(&kernel_mutex); |
3710 | + srv_fatal_semaphore_wait_threshold += |
3711 | + SRV_SEMAPHORE_WAIT_EXTENSION; |
3712 | + mutex_exit(&kernel_mutex); |
3713 | + |
3714 | + ibool valid = TRUE; |
3715 | + valid = btr_validate_index(index, prebuilt->trx); |
3716 | + |
3717 | + /* Restore the fatal lock wait timeout after |
3718 | + CHECK TABLE. */ |
3719 | + mutex_enter(&kernel_mutex); |
3720 | + srv_fatal_semaphore_wait_threshold -= |
3721 | + SRV_SEMAPHORE_WAIT_EXTENSION; |
3722 | + mutex_exit(&kernel_mutex); |
3723 | + |
3724 | + if (!valid) { |
3725 | + is_ok = FALSE; |
3726 | + |
3727 | + innobase_format_name( |
3728 | + index_name, sizeof index_name, |
3729 | + index->name, TRUE); |
3730 | + push_warning_printf(thd, |
3731 | + MYSQL_ERROR::WARN_LEVEL_WARN, |
3732 | + ER_NOT_KEYFILE, |
3733 | + "InnoDB: The B-tree of" |
3734 | + " index %s is corrupted.", |
3735 | + index_name); |
3736 | + |
3737 | + continue; |
3738 | + } |
3739 | + } |
3740 | |
3741 | /* Instead of invoking change_active_index(), set up |
3742 | a dummy template for non-locking reads, disabling |
3743 | @@ -9725,21 +9745,17 @@ |
3744 | /* Restore the original isolation level */ |
3745 | prebuilt->trx->isolation_level = old_isolation_level; |
3746 | |
3747 | - /* We validate also the whole adaptive hash index for all tables |
3748 | - at every CHECK TABLE */ |
3749 | +#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG |
3750 | + /* We validate the whole adaptive hash index for all tables |
3751 | + at every CHECK TABLE only when QUICK flag is not present. */ |
3752 | |
3753 | - if (!btr_search_validate()) { |
3754 | + if (!(check_opt->flags & T_QUICK) && !btr_search_validate()) { |
3755 | push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, |
3756 | ER_NOT_KEYFILE, |
3757 | "InnoDB: The adaptive hash index is corrupted."); |
3758 | is_ok = FALSE; |
3759 | } |
3760 | - |
3761 | - /* Restore the fatal lock wait timeout after CHECK TABLE. */ |
3762 | - mutex_enter(&kernel_mutex); |
3763 | - srv_fatal_semaphore_wait_threshold -= SRV_SEMAPHORE_WAIT_EXTENSION; |
3764 | - mutex_exit(&kernel_mutex); |
3765 | - |
3766 | +#endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */ |
3767 | prebuilt->trx->op_info = ""; |
3768 | if (thd_killed(user_thd)) { |
3769 | my_error(ER_QUERY_INTERRUPTED, MYF(0)); |
3770 | @@ -10623,6 +10639,7 @@ |
3771 | const long MAX_STATUS_SIZE = 1048576; |
3772 | ulint trx_list_start = ULINT_UNDEFINED; |
3773 | ulint trx_list_end = ULINT_UNDEFINED; |
3774 | + bool ret_val; |
3775 | |
3776 | DBUG_ENTER("innodb_show_status"); |
3777 | DBUG_ASSERT(hton == innodb_hton_ptr); |
3778 | @@ -10687,12 +10704,13 @@ |
3779 | |
3780 | mutex_exit(&srv_monitor_file_mutex); |
3781 | |
3782 | - stat_print(thd, innobase_hton_name, (uint) strlen(innobase_hton_name), |
3783 | - STRING_WITH_LEN(""), str, flen); |
3784 | + ret_val= stat_print(thd, innobase_hton_name, |
3785 | + (uint) strlen(innobase_hton_name), |
3786 | + STRING_WITH_LEN(""), str, flen); |
3787 | |
3788 | my_free(str); |
3789 | |
3790 | - DBUG_RETURN(FALSE); |
3791 | + DBUG_RETURN(ret_val); |
3792 | } |
3793 | |
3794 | /************************************************************************//** |
3795 | |
3796 | === modified file 'Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c' |
3797 | --- Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c 2013-10-22 13:33:14 +0000 |
3798 | +++ Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c 2013-12-05 18:48:48 +0000 |
3799 | @@ -194,11 +194,6 @@ |
3800 | /** Operations that can currently be buffered. */ |
3801 | UNIV_INTERN ibuf_use_t ibuf_use = IBUF_USE_ALL; |
3802 | |
3803 | -#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG |
3804 | -/** Flag to control insert buffer debugging. */ |
3805 | -UNIV_INTERN uint ibuf_debug; |
3806 | -#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ |
3807 | - |
3808 | /** The insert buffer control structure */ |
3809 | UNIV_INTERN ibuf_t* ibuf = NULL; |
3810 | |
3811 | @@ -2693,6 +2688,12 @@ |
3812 | return(0); |
3813 | } |
3814 | |
3815 | +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG |
3816 | + if (ibuf_debug) { |
3817 | + return(0); |
3818 | + } |
3819 | +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ |
3820 | + |
3821 | ibuf_mtr_start(&mtr); |
3822 | |
3823 | /* Open a cursor to a randomly chosen leaf of the tree, at a random |
3824 | @@ -4066,6 +4067,24 @@ |
3825 | to btr_cur_update_in_place(). */ |
3826 | row_upd_rec_in_place(rec, index, offsets, |
3827 | update, page_zip); |
3828 | + |
3829 | + /* Log the update in place operation. During recovery |
3830 | + MLOG_COMP_REC_UPDATE_IN_PLACE/MLOG_REC_UPDATE_IN_PLACE |
3831 | + expects trx_id, roll_ptr for secondary indexes. So we |
3832 | + just write dummy trx_id(0), roll_ptr(0) */ |
3833 | + btr_cur_update_in_place_log(BTR_KEEP_SYS_FLAG, rec, |
3834 | + index, update, |
3835 | + NULL, 0, mtr); |
3836 | + DBUG_EXECUTE_IF( |
3837 | + "crash_after_log_ibuf_upd_inplace", |
3838 | + log_buffer_flush_to_disk(); |
3839 | + fprintf(stderr, |
3840 | + "InnoDB: Wrote log record for ibuf " |
3841 | + "update in place operation\n"); |
3842 | + DBUG_SUICIDE(); |
3843 | + ); |
3844 | + |
3845 | + |
3846 | goto updated_in_place; |
3847 | } |
3848 | |
3849 | |
3850 | === modified file 'Percona-Server/storage/innobase/include/btr0cur.h' |
3851 | --- Percona-Server/storage/innobase/include/btr0cur.h 2013-05-23 08:39:28 +0000 |
3852 | +++ Percona-Server/storage/innobase/include/btr0cur.h 2013-12-05 18:48:48 +0000 |
3853 | @@ -637,6 +637,21 @@ |
3854 | uncompressed */ |
3855 | ibool val, /*!< in: value to set */ |
3856 | mtr_t* mtr); /*!< in/out: mini-transaction */ |
3857 | + |
3858 | +/***********************************************************//** |
3859 | +Writes a redo log record of updating a record in-place. */ |
3860 | +UNIV_INTERN |
3861 | +void |
3862 | +btr_cur_update_in_place_log( |
3863 | +/*========================*/ |
3864 | + ulint flags, /*!< in: flags */ |
3865 | + rec_t* rec, /*!< in: record */ |
3866 | + dict_index_t* index, /*!< in: index where cursor positioned */ |
3867 | + const upd_t* update, /*!< in: update vector */ |
3868 | + trx_t* trx, /*!< in: transaction */ |
3869 | + roll_ptr_t roll_ptr, /*!< in: roll ptr */ |
3870 | + mtr_t* mtr); /*!< in: mtr */ |
3871 | + |
3872 | /*######################################################################*/ |
3873 | |
3874 | /** In the pessimistic delete, if the page data size drops below this |
3875 | |
3876 | === modified file 'Percona-Server/storage/innobase/include/btr0pcur.h' |
3877 | --- Percona-Server/storage/innobase/include/btr0pcur.h 2013-06-10 20:29:41 +0000 |
3878 | +++ Percona-Server/storage/innobase/include/btr0pcur.h 2013-12-05 18:48:48 +0000 |
3879 | @@ -1,6 +1,6 @@ |
3880 | /***************************************************************************** |
3881 | |
3882 | -Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. |
3883 | +Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. |
3884 | |
3885 | This program is free software; you can redistribute it and/or modify it under |
3886 | the terms of the GNU General Public License as published by the Free Software |
3887 | @@ -447,6 +447,27 @@ |
3888 | /*==========================*/ |
3889 | btr_pcur_t* cursor);/*!< in/out: persistent cursor */ |
3890 | |
3891 | +/** Position state of persistent B-tree cursor. */ |
3892 | +enum pcur_pos_t { |
3893 | + /** The persistent cursor is not positioned. */ |
3894 | + BTR_PCUR_NOT_POSITIONED = 0, |
3895 | + /** The persistent cursor was previously positioned. |
3896 | + TODO: currently, the state can be BTR_PCUR_IS_POSITIONED, |
3897 | + though it really should be BTR_PCUR_WAS_POSITIONED, |
3898 | + because we have no obligation to commit the cursor with |
3899 | + mtr; similarly latch_mode may be out of date. This can |
3900 | + lead to problems if btr_pcur is not used the right way; |
3901 | + all current code should be ok. */ |
3902 | + BTR_PCUR_WAS_POSITIONED, |
3903 | + /** The persistent cursor is positioned by optimistic get to the same |
3904 | + record as it was positioned at. Not used for rel_pos == BTR_PCUR_ON. |
3905 | + It may need adjustment depending on previous/current search direction |
3906 | + and rel_pos. */ |
3907 | + BTR_PCUR_IS_POSITIONED_OPTIMISTIC, |
3908 | + /** The persistent cursor is positioned by index search. |
3909 | + Or optimistic get for rel_pos == BTR_PCUR_ON. */ |
3910 | + BTR_PCUR_IS_POSITIONED |
3911 | +}; |
3912 | |
3913 | /* The persistent B-tree cursor structure. This is used mainly for SQL |
3914 | selects, updates, and deletes. */ |
3915 | @@ -480,10 +501,8 @@ |
3916 | ib_uint64_t modify_clock; /*!< the modify clock value of the |
3917 | buffer block when the cursor position |
3918 | was stored */ |
3919 | - ulint pos_state; /*!< see TODO note below! |
3920 | - BTR_PCUR_IS_POSITIONED, |
3921 | - BTR_PCUR_WAS_POSITIONED, |
3922 | - BTR_PCUR_NOT_POSITIONED */ |
3923 | + enum pcur_pos_t pos_state; /*!< btr_pcur_store_position() and |
3924 | + btr_pcur_restore_position() state. */ |
3925 | ulint search_mode; /*!< PAGE_CUR_G, ... */ |
3926 | trx_t* trx_if_known; /*!< the transaction, if we know it; |
3927 | otherwise this field is not defined; |
3928 | @@ -499,21 +518,6 @@ |
3929 | is not NULL */ |
3930 | }; |
3931 | |
3932 | -#define BTR_PCUR_IS_POSITIONED 1997660512 /* TODO: currently, the state |
3933 | - can be BTR_PCUR_IS_POSITIONED, |
3934 | - though it really should be |
3935 | - BTR_PCUR_WAS_POSITIONED, |
3936 | - because we have no obligation |
3937 | - to commit the cursor with |
3938 | - mtr; similarly latch_mode may |
3939 | - be out of date. This can |
3940 | - lead to problems if btr_pcur |
3941 | - is not used the right way; |
3942 | - all current code should be |
3943 | - ok. */ |
3944 | -#define BTR_PCUR_WAS_POSITIONED 1187549791 |
3945 | -#define BTR_PCUR_NOT_POSITIONED 1328997689 |
3946 | - |
3947 | #define BTR_PCUR_OLD_STORED 908467085 |
3948 | #define BTR_PCUR_OLD_NOT_STORED 122766467 |
3949 | |
3950 | |
3951 | === modified file 'Percona-Server/storage/innobase/include/btr0pcur.ic' |
3952 | --- Percona-Server/storage/innobase/include/btr0pcur.ic 2013-06-10 20:29:41 +0000 |
3953 | +++ Percona-Server/storage/innobase/include/btr0pcur.ic 2013-12-05 18:48:48 +0000 |
3954 | @@ -1,6 +1,6 @@ |
3955 | /***************************************************************************** |
3956 | |
3957 | -Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. |
3958 | +Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. |
3959 | |
3960 | This program is free software; you can redistribute it and/or modify it under |
3961 | the terms of the GNU General Public License as published by the Free Software |
3962 | @@ -379,7 +379,7 @@ |
3963 | btr_pcur_t* pcur, /*!< in: persistent cursor */ |
3964 | mtr_t* mtr) /*!< in: mtr to commit */ |
3965 | { |
3966 | - ut_a(pcur->pos_state == BTR_PCUR_IS_POSITIONED); |
3967 | + ut_ad(pcur->pos_state == BTR_PCUR_IS_POSITIONED); |
3968 | |
3969 | pcur->latch_mode = BTR_NO_LATCHES; |
3970 | |
3971 | |
3972 | === modified file 'Percona-Server/storage/innobase/include/btr0sea.h' |
3973 | --- Percona-Server/storage/innobase/include/btr0sea.h 2013-09-06 13:24:59 +0000 |
3974 | +++ Percona-Server/storage/innobase/include/btr0sea.h 2013-12-05 18:48:48 +0000 |
3975 | @@ -196,8 +196,6 @@ |
3976 | ibool |
3977 | btr_search_validate(void); |
3978 | /*======================*/ |
3979 | -#else |
3980 | -# define btr_search_validate() TRUE |
3981 | #endif /* defined UNIV_AHI_DEBUG || defined UNIV_DEBUG */ |
3982 | |
3983 | /********************************************************************//** |
3984 | |
3985 | === modified file 'Percona-Server/storage/innobase/include/dict0types.h' |
3986 | --- Percona-Server/storage/innobase/include/dict0types.h 2013-06-25 01:42:54 +0000 |
3987 | +++ Percona-Server/storage/innobase/include/dict0types.h 2013-12-05 18:48:48 +0000 |
3988 | @@ -63,4 +63,9 @@ |
3989 | #define TEMP_TABLE_PREFIX "#sql" |
3990 | #define TEMP_TABLE_PATH_PREFIX "/" TEMP_TABLE_PREFIX |
3991 | |
3992 | +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG |
3993 | +/** Flag to control insert buffer debugging. */ |
3994 | +extern uint ibuf_debug; |
3995 | +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ |
3996 | + |
3997 | #endif |
3998 | |
3999 | === modified file 'Percona-Server/storage/innobase/include/ibuf0ibuf.h' |
4000 | --- Percona-Server/storage/innobase/include/ibuf0ibuf.h 2013-08-02 09:40:55 +0000 |
4001 | +++ Percona-Server/storage/innobase/include/ibuf0ibuf.h 2013-12-05 18:48:48 +0000 |
4002 | @@ -63,11 +63,6 @@ |
4003 | /** Operations that can currently be buffered. */ |
4004 | extern ibuf_use_t ibuf_use; |
4005 | |
4006 | -#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG |
4007 | -/** Flag to control insert buffer debugging. */ |
4008 | -extern uint ibuf_debug; |
4009 | -#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ |
4010 | - |
4011 | /** The insert buffer control structure */ |
4012 | extern ibuf_t* ibuf; |
4013 | |
4014 | |
4015 | === modified file 'Percona-Server/storage/innobase/include/log0log.h' |
4016 | --- Percona-Server/storage/innobase/include/log0log.h 2013-05-31 09:31:09 +0000 |
4017 | +++ Percona-Server/storage/innobase/include/log0log.h 2013-12-05 18:48:48 +0000 |
4018 | @@ -822,6 +822,8 @@ |
4019 | later; this is advanced when a flush |
4020 | operation is completed to all the log |
4021 | groups */ |
4022 | + volatile ibool is_extending; /*!< this is set to true during extend |
4023 | + the log buffer size */ |
4024 | ib_uint64_t written_to_some_lsn; |
4025 | /*!< first log sequence number not yet |
4026 | written to any log group; for this to |
4027 | |
4028 | === modified file 'Percona-Server/storage/innobase/log/log0log.c' |
4029 | --- Percona-Server/storage/innobase/log/log0log.c 2013-06-01 15:04:43 +0000 |
4030 | +++ Percona-Server/storage/innobase/log/log0log.c 2013-12-05 18:48:48 +0000 |
4031 | @@ -262,6 +262,85 @@ |
4032 | return tracked_lsn_age + lsn_advance > log_sys->max_checkpoint_age; |
4033 | } |
4034 | |
4035 | +/** Extends the log buffer. |
4036 | +@param[in] len requested minimum size in bytes */ |
4037 | +static |
4038 | +void |
4039 | +log_buffer_extend( |
4040 | + ulint len) |
4041 | +{ |
4042 | + ulint move_start; |
4043 | + ulint move_end; |
4044 | + byte tmp_buf[OS_FILE_LOG_BLOCK_SIZE]; |
4045 | + |
4046 | + mutex_enter(&(log_sys->mutex)); |
4047 | + |
4048 | + while (log_sys->is_extending) { |
4049 | + /* Another thread is trying to extend already. |
4050 | + Needs to wait for. */ |
4051 | + mutex_exit(&(log_sys->mutex)); |
4052 | + |
4053 | + log_buffer_flush_to_disk(); |
4054 | + |
4055 | + mutex_enter(&(log_sys->mutex)); |
4056 | + |
4057 | + if (srv_log_buffer_size > len / UNIV_PAGE_SIZE) { |
4058 | + /* Already extended enough by the others */ |
4059 | + mutex_exit(&(log_sys->mutex)); |
4060 | + return; |
4061 | + } |
4062 | + } |
4063 | + |
4064 | + log_sys->is_extending = TRUE; |
4065 | + |
4066 | + while (log_sys->n_pending_writes != 0 |
4067 | + || ut_calc_align_down(log_sys->buf_free, |
4068 | + OS_FILE_LOG_BLOCK_SIZE) |
4069 | + != ut_calc_align_down(log_sys->buf_next_to_write, |
4070 | + OS_FILE_LOG_BLOCK_SIZE)) { |
4071 | + /* Buffer might have >1 blocks to write still. */ |
4072 | + mutex_exit(&(log_sys->mutex)); |
4073 | + |
4074 | + log_buffer_flush_to_disk(); |
4075 | + |
4076 | + mutex_enter(&(log_sys->mutex)); |
4077 | + } |
4078 | + |
4079 | + move_start = ut_calc_align_down( |
4080 | + log_sys->buf_free, |
4081 | + OS_FILE_LOG_BLOCK_SIZE); |
4082 | + move_end = log_sys->buf_free; |
4083 | + |
4084 | + /* store the last log block in buffer */ |
4085 | + ut_memcpy(tmp_buf, log_sys->buf + move_start, |
4086 | + move_end - move_start); |
4087 | + |
4088 | + log_sys->buf_free -= move_start; |
4089 | + log_sys->buf_next_to_write -= move_start; |
4090 | + |
4091 | + /* reallocate log buffer */ |
4092 | + srv_log_buffer_size = len / UNIV_PAGE_SIZE + 1; |
4093 | + mem_free(log_sys->buf_ptr); |
4094 | + log_sys->buf_ptr = mem_alloc(LOG_BUFFER_SIZE + OS_FILE_LOG_BLOCK_SIZE); |
4095 | + log_sys->buf = ut_align(log_sys->buf_ptr, OS_FILE_LOG_BLOCK_SIZE); |
4096 | + log_sys->buf_size = LOG_BUFFER_SIZE; |
4097 | + memset(log_sys->buf, '\0', LOG_BUFFER_SIZE); |
4098 | + log_sys->max_buf_free = log_sys->buf_size / LOG_BUF_FLUSH_RATIO |
4099 | + - LOG_BUF_FLUSH_MARGIN; |
4100 | + |
4101 | + /* restore the last log block */ |
4102 | + ut_memcpy(log_sys->buf, tmp_buf, move_end - move_start); |
4103 | + |
4104 | + ut_ad(log_sys->is_extending); |
4105 | + log_sys->is_extending = FALSE; |
4106 | + |
4107 | + mutex_exit(&(log_sys->mutex)); |
4108 | + |
4109 | + fprintf(stderr, |
4110 | + "InnoDB: innodb_log_buffer_size was extended to %lu.\n", |
4111 | + LOG_BUFFER_SIZE); |
4112 | +} |
4113 | + |
4114 | /************************************************************//** |
4115 | Opens the log for log_write_low. The log must be closed with log_close. |
4116 | @return start lsn of the log record */ |
4117 | @@ -279,10 +358,38 @@ |
4118 | #endif /* UNIV_LOG_ARCHIVE */ |
4119 | ulint count = 0; |
4120 | |
4121 | - ut_a(len < log->buf_size / 2); |
4122 | + if (len >= log->buf_size / 2) { |
4123 | + DBUG_EXECUTE_IF("ib_log_buffer_is_short_crash", |
4124 | + DBUG_SUICIDE();); |
4125 | + |
4126 | + /* log_buffer is too small. try to extend instead of crash. */ |
4127 | + ut_print_timestamp(stderr); |
4128 | + fprintf(stderr, |
4129 | + " InnoDB: Warning: " |
4130 | + "The transaction log size is too large" |
4131 | + " for innodb_log_buffer_size (%lu >= %lu / 2). " |
4132 | + "Trying to extend it.\n", |
4133 | + len, LOG_BUFFER_SIZE); |
4134 | + |
4135 | + log_buffer_extend((len + 1) * 2); |
4136 | + } |
4137 | loop: |
4138 | ut_ad(!recv_no_log_write); |
4139 | |
4140 | + if (log->is_extending) { |
4141 | + |
4142 | + mutex_exit(&(log->mutex)); |
4143 | + |
4144 | + /* Log buffer size is extending. Writing up to the next block |
4145 | + should wait for the extending finished. */ |
4146 | + |
4147 | + os_thread_sleep(100000); |
4148 | + |
4149 | + ut_ad(++count < 50); |
4150 | + |
4151 | + goto loop; |
4152 | + } |
4153 | + |
4154 | /* Calculate an upper limit for the space the string may take in the |
4155 | log buffer */ |
4156 | |
4157 | @@ -899,6 +1006,7 @@ |
4158 | log_sys->buf = ut_align(log_sys->buf_ptr, OS_FILE_LOG_BLOCK_SIZE); |
4159 | |
4160 | log_sys->buf_size = LOG_BUFFER_SIZE; |
4161 | + log_sys->is_extending = FALSE; |
4162 | |
4163 | memset(log_sys->buf, '\0', LOG_BUFFER_SIZE); |
4164 | |
4165 | |
4166 | === modified file 'Percona-Server/storage/innobase/row/row0sel.c' |
4167 | --- Percona-Server/storage/innobase/row/row0sel.c 2013-10-22 13:33:14 +0000 |
4168 | +++ Percona-Server/storage/innobase/row/row0sel.c 2013-12-05 18:48:48 +0000 |
4169 | @@ -3099,48 +3099,78 @@ |
4170 | mtr_t* mtr) /*!< in: mtr; CAUTION: may commit |
4171 | mtr temporarily! */ |
4172 | { |
4173 | - ibool success; |
4174 | - ulint relative_position; |
4175 | - |
4176 | - relative_position = pcur->rel_pos; |
4177 | + ibool success; |
4178 | |
4179 | success = btr_pcur_restore_position(latch_mode, pcur, mtr); |
4180 | |
4181 | *same_user_rec = success; |
4182 | |
4183 | - if (relative_position == BTR_PCUR_ON) { |
4184 | - if (success) { |
4185 | - return(FALSE); |
4186 | - } |
4187 | - |
4188 | - if (moves_up) { |
4189 | + ut_ad(!success || pcur->rel_pos == BTR_PCUR_ON); |
4190 | +#ifdef UNIV_DEBUG |
4191 | + if (pcur->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC) { |
4192 | + ut_ad(pcur->rel_pos == BTR_PCUR_BEFORE |
4193 | + || pcur->rel_pos == BTR_PCUR_AFTER); |
4194 | + } else { |
4195 | + ut_ad(pcur->pos_state == BTR_PCUR_IS_POSITIONED); |
4196 | + ut_ad((pcur->rel_pos == BTR_PCUR_ON) |
4197 | + == btr_pcur_is_on_user_rec(pcur)); |
4198 | + } |
4199 | +#endif |
4200 | + |
4201 | + /* The position may need be adjusted for rel_pos and moves_up. */ |
4202 | + |
4203 | + switch (pcur->rel_pos) { |
4204 | + case BTR_PCUR_ON: |
4205 | + if (!success && moves_up) { |
4206 | +next: |
4207 | btr_pcur_move_to_next(pcur, mtr); |
4208 | + return(TRUE); |
4209 | } |
4210 | - |
4211 | + return(!success); |
4212 | + case BTR_PCUR_AFTER_LAST_IN_TREE: |
4213 | + case BTR_PCUR_BEFORE_FIRST_IN_TREE: |
4214 | return(TRUE); |
4215 | - } |
4216 | - |
4217 | - if (relative_position == BTR_PCUR_AFTER |
4218 | - || relative_position == BTR_PCUR_AFTER_LAST_IN_TREE) { |
4219 | - |
4220 | - if (moves_up) { |
4221 | - return(TRUE); |
4222 | - } |
4223 | - |
4224 | - if (btr_pcur_is_on_user_rec(pcur)) { |
4225 | + case BTR_PCUR_AFTER: |
4226 | + /* positioned to record after pcur->old_rec. */ |
4227 | + pcur->pos_state = BTR_PCUR_IS_POSITIONED; |
4228 | +prev: |
4229 | + if (btr_pcur_is_on_user_rec(pcur) && !moves_up) { |
4230 | btr_pcur_move_to_prev(pcur, mtr); |
4231 | } |
4232 | - |
4233 | return(TRUE); |
4234 | - } |
4235 | - |
4236 | - ut_ad(relative_position == BTR_PCUR_BEFORE |
4237 | - || relative_position == BTR_PCUR_BEFORE_FIRST_IN_TREE); |
4238 | - |
4239 | - if (moves_up && btr_pcur_is_on_user_rec(pcur)) { |
4240 | - btr_pcur_move_to_next(pcur, mtr); |
4241 | - } |
4242 | - |
4243 | + case BTR_PCUR_BEFORE: |
4244 | + /* For non optimistic restoration: |
4245 | + The position is now set to the record before pcur->old_rec. |
4246 | + |
4247 | + For optimistic restoration: |
4248 | + The position also needs to take the previous search_mode into |
4249 | + consideration. */ |
4250 | + |
4251 | + switch (pcur->pos_state) { |
4252 | + case BTR_PCUR_IS_POSITIONED_OPTIMISTIC: |
4253 | + pcur->pos_state = BTR_PCUR_IS_POSITIONED; |
4254 | + if (pcur->search_mode == PAGE_CUR_GE) { |
4255 | + /* Positioned during Greater or Equal search |
4256 | + with BTR_PCUR_BEFORE. Optimistic restore to |
4257 | + the same record. If scanning for lower then |
4258 | + we must move to previous record. |
4259 | + This can happen with: |
4260 | + HANDLER READ idx a = (const); |
4261 | + HANDLER READ idx PREV; */ |
4262 | + goto prev; |
4263 | + } |
4264 | + return(TRUE); |
4265 | + case BTR_PCUR_IS_POSITIONED: |
4266 | + if (moves_up && btr_pcur_is_on_user_rec(pcur)) { |
4267 | + goto next; |
4268 | + } |
4269 | + return(TRUE); |
4270 | + case BTR_PCUR_WAS_POSITIONED: |
4271 | + case BTR_PCUR_NOT_POSITIONED: |
4272 | + break; |
4273 | + } |
4274 | + } |
4275 | + ut_ad(0); |
4276 | return(TRUE); |
4277 | } |
4278 | |
4279 | @@ -4141,6 +4171,14 @@ |
4280 | |
4281 | btr_pcur_store_position(pcur, &mtr); |
4282 | |
4283 | + /* The found record was not a match, but may be used |
4284 | + as NEXT record (index_next). Set the relative position |
4285 | + to BTR_PCUR_BEFORE, to reflect that the position of |
4286 | + the persistent cursor is before the found/stored row |
4287 | + (pcur->old_rec). */ |
4288 | + ut_ad(pcur->rel_pos == BTR_PCUR_ON); |
4289 | + pcur->rel_pos = BTR_PCUR_BEFORE; |
4290 | + |
4291 | err = DB_RECORD_NOT_FOUND; |
4292 | /* ut_print_name(stderr, index->name); |
4293 | fputs(" record not found 3\n", stderr); */ |
4294 | @@ -4180,6 +4218,14 @@ |
4295 | |
4296 | btr_pcur_store_position(pcur, &mtr); |
4297 | |
4298 | + /* The found record was not a match, but may be used |
4299 | + as NEXT record (index_next). Set the relative position |
4300 | + to BTR_PCUR_BEFORE, to reflect that the position of |
4301 | + the persistent cursor is before the found/stored row |
4302 | + (pcur->old_rec). */ |
4303 | + ut_ad(pcur->rel_pos == BTR_PCUR_ON); |
4304 | + pcur->rel_pos = BTR_PCUR_BEFORE; |
4305 | + |
4306 | err = DB_RECORD_NOT_FOUND; |
4307 | /* ut_print_name(stderr, index->name); |
4308 | fputs(" record not found 4\n", stderr); */ |
4309 | @@ -4757,6 +4803,7 @@ |
4310 | if (prebuilt->n_fetch_cached > 0) { |
4311 | row_sel_pop_cached_row_for_mysql(buf, prebuilt); |
4312 | |
4313 | + DEBUG_SYNC_C("row_search_cached_row"); |
4314 | err = DB_SUCCESS; |
4315 | } |
4316 | |
4317 | |
4318 | === modified file 'Percona-Server/strings/CMakeLists.txt' |
4319 | --- Percona-Server/strings/CMakeLists.txt 2011-06-30 15:46:53 +0000 |
4320 | +++ Percona-Server/strings/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
4321 | @@ -31,3 +31,8 @@ |
4322 | # Avoid dependencies on perschema data defined in mysys |
4323 | ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H) |
4324 | ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES}) |
4325 | + |
4326 | +INSTALL_DEBUG_SYMBOLS(strings) |
4327 | +IF(MSVC) |
4328 | + INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug) |
4329 | +ENDIF() |
4330 | |
4331 | === modified file 'Percona-Server/strings/ctype-win1250ch.c' |
4332 | --- Percona-Server/strings/ctype-win1250ch.c 2011-06-30 15:46:53 +0000 |
4333 | +++ Percona-Server/strings/ctype-win1250ch.c 2013-12-05 18:48:48 +0000 |
4334 | @@ -500,7 +500,7 @@ |
4335 | |
4336 | do { |
4337 | NEXT_CMP_VALUE(src, p, pass, value, (int)srclen); |
4338 | - if (totlen <= len) |
4339 | + if (totlen < len) |
4340 | dest[totlen] = value; |
4341 | totlen++; |
4342 | } while (value) ; |
4343 | |
4344 | === modified file 'Percona-Server/support-files/mysql.spec.sh' |
4345 | --- Percona-Server/support-files/mysql.spec.sh 2013-09-09 17:49:44 +0000 |
4346 | +++ Percona-Server/support-files/mysql.spec.sh 2013-12-05 18:48:48 +0000 |
4347 | @@ -1058,7 +1058,9 @@ |
4348 | %doc release/Docs/INFO_BIN* |
4349 | %doc release/support-files/my-*.cnf |
4350 | |
4351 | +%if 0%{?commercial} |
4352 | %doc %attr(644, root, root) %{_infodir}/mysql.info* |
4353 | +%endif |
4354 | |
4355 | %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* |
4356 | %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* |
4357 | @@ -1215,6 +1217,9 @@ |
4358 | # merging BK trees) |
4359 | ############################################################################## |
4360 | %changelog |
4361 | +* Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> |
4362 | +- Removed non gpl file docs/mysql.info from community packages |
4363 | + |
4364 | * Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> |
4365 | - Updated logic to get the correct count of PID files |
4366 | |
4367 | |
4368 | === modified file 'Percona-Server/vio/CMakeLists.txt' |
4369 | --- Percona-Server/vio/CMakeLists.txt 2013-02-26 05:35:17 +0000 |
4370 | +++ Percona-Server/vio/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
4371 | @@ -20,3 +20,8 @@ |
4372 | SET(VIO_SOURCES vio.c viosocket.c viossl.c viosslfactories.c) |
4373 | ADD_CONVENIENCE_LIBRARY(vio ${VIO_SOURCES}) |
4374 | TARGET_LINK_LIBRARIES(vio ${LIBSOCKET}) |
4375 | + |
4376 | +INSTALL_DEBUG_SYMBOLS(vio) |
4377 | +IF(MSVC) |
4378 | + INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug) |
4379 | +ENDIF() |
4380 | |
4381 | === modified file 'Percona-Server/vio/viosslfactories.c' |
4382 | --- Percona-Server/vio/viosslfactories.c 2013-06-27 15:35:20 +0000 |
4383 | +++ Percona-Server/vio/viosslfactories.c 2013-12-05 18:48:48 +0000 |
4384 | @@ -78,7 +78,7 @@ |
4385 | "No error", |
4386 | "Unable to get certificate", |
4387 | "Unable to get private key", |
4388 | - "Private key does not match the certificate public key" |
4389 | + "Private key does not match the certificate public key", |
4390 | "SSL_CTX_set_default_verify_paths failed", |
4391 | "Failed to set ciphers to use", |
4392 | "SSL_CTX_new failed" |
4393 | |
4394 | === modified file 'Percona-Server/zlib/CMakeLists.txt' |
4395 | --- Percona-Server/zlib/CMakeLists.txt 2013-02-26 05:35:17 +0000 |
4396 | +++ Percona-Server/zlib/CMakeLists.txt 2013-12-05 18:48:48 +0000 |
4397 | @@ -23,3 +23,8 @@ |
4398 | ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES}) |
4399 | RESTRICT_SYMBOL_EXPORTS(zlib) |
4400 | |
4401 | +INSTALL_DEBUG_SYMBOLS(zlib) |
4402 | +IF(MSVC) |
4403 | + INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug) |
4404 | +ENDIF() |
4405 | + |