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