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

Proposed by Laurynas Biveinis on 2014-09-24
Status: Merged
Approved by: Laurynas Biveinis on 2014-09-24
Approved revision: 699
Merged at revision: 699
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.5.40
Merge into: lp:percona-server/5.5
Diff against target: 8332 lines (+2327/-1226)
128 files modified
VERSION (+1/-1)
client/mysql.cc (+10/-0)
cmake/dtrace.cmake (+15/-3)
extra/yassl/README (+25/-9)
extra/yassl/certs/ca-cert.pem (+50/-50)
extra/yassl/certs/client-cert.pem (+50/-50)
extra/yassl/certs/client-keyEnc.pem (+8/-26)
extra/yassl/certs/dsa1024.pem (+12/-0)
extra/yassl/certs/dsa512.pem (+0/-8)
extra/yassl/certs/server-cert.pem (+113/-97)
extra/yassl/certs/server-keyEnc.pem (+26/-26)
extra/yassl/include/buffer.hpp (+14/-4)
extra/yassl/include/openssl/ssl.h (+1/-1)
extra/yassl/src/buffer.cpp (+88/-27)
extra/yassl/src/handshake.cpp (+17/-8)
extra/yassl/src/yassl_imp.cpp (+161/-18)
extra/yassl/src/yassl_int.cpp (+4/-3)
extra/yassl/taocrypt/include/asn.hpp (+7/-4)
extra/yassl/taocrypt/include/block.hpp (+3/-3)
extra/yassl/taocrypt/include/integer.hpp (+2/-2)
extra/yassl/taocrypt/include/pwdbased.hpp (+3/-5)
extra/yassl/taocrypt/include/runtime.hpp (+14/-3)
extra/yassl/taocrypt/include/sha.hpp (+7/-2)
extra/yassl/taocrypt/src/aes.cpp (+9/-10)
extra/yassl/taocrypt/src/algebra.cpp (+4/-4)
extra/yassl/taocrypt/src/arc4.cpp (+5/-6)
extra/yassl/taocrypt/src/asn.cpp (+40/-8)
extra/yassl/taocrypt/src/blowfish.cpp (+4/-4)
extra/yassl/taocrypt/src/des.cpp (+5/-6)
extra/yassl/taocrypt/src/integer.cpp (+15/-22)
extra/yassl/taocrypt/src/md5.cpp (+5/-5)
extra/yassl/taocrypt/src/misc.cpp (+10/-12)
extra/yassl/taocrypt/src/rabbit.cpp (+5/-5)
extra/yassl/taocrypt/src/random.cpp (+2/-1)
extra/yassl/taocrypt/src/ripemd.cpp (+7/-6)
extra/yassl/taocrypt/src/sha.cpp (+5/-6)
extra/yassl/taocrypt/src/twofish.cpp (+6/-7)
man/comp_err.1 (+2/-2)
man/innochecksum.1 (+2/-2)
man/msql2mysql.1 (+2/-2)
man/my_print_defaults.1 (+2/-2)
man/myisam_ftdump.1 (+2/-2)
man/myisamchk.1 (+2/-2)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+2/-2)
man/mysql-stress-test.pl.1 (+2/-2)
man/mysql-test-run.pl.1 (+3/-3)
man/mysql.1 (+24/-4)
man/mysql.server.1 (+3/-3)
man/mysql_client_test.1 (+2/-2)
man/mysql_config.1 (+2/-2)
man/mysql_convert_table_format.1 (+2/-2)
man/mysql_find_rows.1 (+2/-2)
man/mysql_fix_extensions.1 (+2/-2)
man/mysql_install_db.1 (+2/-2)
man/mysql_plugin.1 (+2/-2)
man/mysql_secure_installation.1 (+2/-2)
man/mysql_setpermission.1 (+2/-2)
man/mysql_tzinfo_to_sql.1 (+2/-2)
man/mysql_upgrade.1 (+239/-25)
man/mysql_waitpid.1 (+2/-2)
man/mysql_zap.1 (+2/-2)
man/mysqlaccess.1 (+2/-2)
man/mysqladmin.1 (+23/-3)
man/mysqlbinlog.1 (+25/-22)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+26/-5)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+2/-2)
man/mysqld_safe.1 (+24/-9)
man/mysqldump.1 (+23/-3)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+2/-2)
man/mysqlimport.1 (+23/-3)
man/mysqlshow.1 (+23/-3)
man/mysqlslap.1 (+2/-2)
man/mysqltest.1 (+2/-2)
man/ndb-common-options.1 (+21/-21)
man/ndb_blob_tool.1 (+10/-10)
man/ndb_config.1 (+45/-39)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+14/-13)
man/ndb_desc.1 (+17/-17)
man/ndb_drop_index.1 (+8/-8)
man/ndb_drop_table.1 (+7/-7)
man/ndb_error_reporter.1 (+14/-13)
man/ndb_index_stat.1 (+228/-168)
man/ndb_mgm.1 (+6/-6)
man/ndb_mgmd.8 (+51/-44)
man/ndb_print_backup_file.1 (+2/-2)
man/ndb_print_schema_file.1 (+2/-2)
man/ndb_print_sys_file.1 (+2/-2)
man/ndb_restore.1 (+136/-89)
man/ndb_select_all.1 (+19/-19)
man/ndb_select_count.1 (+13/-13)
man/ndb_show_tables.1 (+10/-10)
man/ndb_size.pl.1 (+20/-20)
man/ndb_waiter.1 (+14/-14)
man/ndbd.8 (+51/-38)
man/ndbd_redo_log_reader.1 (+7/-7)
man/ndbinfo_select_all.1 (+30/-18)
man/ndbmtd.8 (+2/-2)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+2/-2)
man/resolveip.1 (+2/-2)
mysql-test/r/ctype_cp932.result (+35/-0)
mysql-test/r/log_errchk.result (+10/-0)
mysql-test/suite/innodb/r/foreign-keys.result (+16/-0)
mysql-test/suite/innodb/t/foreign-keys.test (+26/-0)
mysql-test/t/ctype_cp932.test (+29/-0)
mysql-test/t/log_errchk.test (+65/-0)
packaging/rpm-oel/mysql.spec.in (+20/-15)
scripts/mysql_system_tables_fix.sql (+17/-0)
sql-common/client.c (+6/-0)
sql/item.cc (+27/-4)
sql/item_strfunc.cc (+20/-0)
sql/log.cc (+5/-0)
sql/mysqld.cc (+3/-0)
sql/mysqld.h (+1/-0)
sql/sql_priv.h (+28/-1)
sql/sys_vars.cc (+2/-1)
storage/innobase/buf/buf0buf.c (+1/-0)
storage/innobase/dict/dict0dict.c (+15/-0)
storage/innobase/row/row0ins.c (+1/-11)
strings/ctype-mb.c (+2/-2)
strings/decimal.c (+2/-2)
support-files/mysql.spec.sh (+10/-5)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.5.40
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2014-09-24
Review via email: mp+235776@code.launchpad.net

Description of the change

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VERSION'
2--- VERSION 2014-08-22 09:58:37 +0000
3+++ VERSION 2014-09-24 09:49:11 +0000
4@@ -1,4 +1,4 @@
5 MYSQL_VERSION_MAJOR=5
6 MYSQL_VERSION_MINOR=5
7-MYSQL_VERSION_PATCH=39
8+MYSQL_VERSION_PATCH=40
9 MYSQL_VERSION_EXTRA=-36.0
10
11=== modified file 'client/mysql.cc'
12--- client/mysql.cc 2014-05-15 08:54:35 +0000
13+++ client/mysql.cc 2014-09-24 09:49:11 +0000
14@@ -1240,6 +1240,16 @@
15
16 sig_handler mysql_end(int sig)
17 {
18+#ifndef _WIN32
19+ /*
20+ Ingnoring SIGQUIT and SIGINT signals when cleanup process starts.
21+ This will help in resolving the double free issues, which occures in case
22+ the signal handler function is started in between the clean up function.
23+ */
24+ signal(SIGQUIT, SIG_IGN);
25+ signal(SIGINT, SIG_IGN);
26+#endif
27+
28 mysql_close(&mysql);
29 #ifdef HAVE_READLINE
30 if (!status.batch && !quick && !opt_html && !opt_xml &&
31
32=== modified file 'cmake/dtrace.cmake'
33--- cmake/dtrace.cmake 2014-08-22 09:58:37 +0000
34+++ cmake/dtrace.cmake 2014-09-24 09:49:11 +0000
35@@ -35,9 +35,21 @@
36 MARK_AS_ADVANCED(DTRACE)
37
38 # On FreeBSD, dtrace does not handle userland tracing yet
39- IF(ENABLE_DTRACE AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
40- OR BUGGY_GCC_NO_DTRACE_MODULES OR NOT DTRACE))
41- MESSAGE(FATAL_ERROR "dtrace is not supported on this system")
42+ IF(ENABLE_DTRACE)
43+ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
44+ OR BUGGY_GCC_NO_DTRACE_MODULES OR NOT DTRACE)
45+ MESSAGE(FATAL_ERROR "dtrace is not supported on this system")
46+ ENDIF()
47+ ELSE()
48+ # 5.5 not able to do Sun dtrace on linux, just disable it
49+ EXECUTE_PROCESS(
50+ COMMAND ${DTRACE} -V
51+ OUTPUT_VARIABLE out)
52+ IF(out MATCHES "Sun D" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
53+ SET(ENABLE_DTRACE OFF CACHE BOOL "Sun DTrace on Linux not supported")
54+ ELSE()
55+ SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
56+ ENDIF()
57 ENDIF()
58
59 SET(HAVE_DTRACE ${ENABLE_DTRACE})
60
61=== modified file 'extra/yassl/README'
62--- extra/yassl/README 2014-02-06 05:46:55 +0000
63+++ extra/yassl/README 2014-09-24 09:49:11 +0000
64@@ -12,15 +12,31 @@
65
66 *** end Note ***
67
68-yaSSL Release notes, version 2.3.0 (12/5/2013)
69-
70- This release of yaSSL updates asm for newer GCC versions.
71-
72-See normal build instructions below under 1.0.6.
73-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
74-
75-
76-*****************yaSSL Release notes, version 2.2.3b (4/23/2013)
77+yaSSL Release notes, version 2.3.4 (8/15/2014)
78+
79+ This release of yaSSL adds checking to the input_buffer class itself.
80+
81+See normal build instructions below under 1.0.6.
82+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
83+
84+
85+yaSSL Release notes, version 2.3.2 (7/25/2014)
86+
87+ This release of yaSSL updates test certs.
88+
89+See normal build instructions below under 1.0.6.
90+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
91+
92+
93+*****************yaSSL Release notes, version 2.3.0 (12/5/2013)
94+
95+ This release of yaSSL updates asm for newer GCC versions.
96+
97+See normal build instructions below under 1.0.6.
98+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
99+
100+
101+*****************yaSSL Release notes, version 2.2.3 (4/23/2013)
102
103 This release of yaSSL updates the test certificates as they were expired
104
105
106=== modified file 'extra/yassl/certs/ca-cert.pem'
107--- extra/yassl/certs/ca-cert.pem 2014-01-08 13:01:42 +0000
108+++ extra/yassl/certs/ca-cert.pem 2014-09-24 09:49:11 +0000
109@@ -1,45 +1,45 @@
110 -----BEGIN CERTIFICATE-----
111-MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
112-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
113-A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
114-dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
115-MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
116-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
117-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
118-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
119-A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
120-8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
121-EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
122-dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
123-mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
124-CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
125-BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
126-P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
127-dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
128-BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
129-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
161 -----END CERTIFICATE-----
162 Certificate:
163 Data:
164 Version: 3 (0x2)
165 Serial Number:
166- e9:d0:a7:5f:79:25:f4:3c
167- Signature Algorithm: sha1WithRSAEncryption
168- Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
169+ 9a:41:47:cd:a1:14:62:8c
170+ Signature Algorithm: sha1WithRSAEncryption
171+ Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
172 Validity
173- Not Before: Oct 24 18:18:15 2011 GMT
174- Not After : Jul 20 18:18:15 2014 GMT
175- Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
176+ Not Before: Jul 11 03:20:08 2014 GMT
177+ Not After : Apr 6 03:20:08 2017 GMT
178+ Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
179 Subject Public Key Info:
180 Public Key Algorithm: rsaEncryption
181- RSA Public Key: (2048 bit)
182- Modulus (2048 bit):
183+ Public-Key: (2048 bit)
184+ Modulus:
185 00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
186 f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
187 de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
188@@ -64,24 +64,24 @@
189 27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
190 X509v3 Authority Key Identifier:
191 keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
192- DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
193- serial:E9:D0:A7:5F:79:25:F4:3C
194+ DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
195+ serial:9A:41:47:CD:A1:14:62:8C
196
197 X509v3 Basic Constraints:
198 CA:TRUE
199 Signature Algorithm: sha1WithRSAEncryption
200- 5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
201- 4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
202- e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
203- f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
204- af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
205- 98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
206- 8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
207- 1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
208- 61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
209- 1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
210- 60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
211- 18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
212- f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
213- b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
214- 5a:1f:7f:ca
215+ 79:78:0c:6d:79:88:91:fc:3a:15:9c:f9:27:62:16:f0:21:1f:
216+ fa:7d:3f:a2:a8:32:1e:f7:f2:11:a9:74:16:74:5e:dc:18:ca:
217+ f0:00:2a:d5:03:06:26:30:f1:47:83:fd:32:6e:fc:ed:aa:4f:
218+ 7d:0c:63:60:31:2f:7c:0c:bf:99:66:87:ed:27:08:86:2d:c4:
219+ 33:e8:98:23:1c:fe:a3:db:9a:49:4e:fc:5a:42:ef:71:c3:3f:
220+ ad:dc:4a:a8:d2:a3:1d:09:ac:33:04:7b:86:f3:6d:00:59:a3:
221+ c8:db:d1:3c:73:f6:0e:90:d6:5e:49:e0:bf:36:63:08:7b:a5:
222+ b0:8f:35:3b:56:8c:11:35:49:04:1c:d0:e7:ba:56:c5:0d:0a:
223+ 91:8d:d6:b7:62:19:34:12:52:4c:d2:6d:7c:c5:3d:0f:18:81:
224+ 54:cb:f6:3c:e5:84:d2:d6:71:15:ec:1a:34:0b:f0:a0:21:74:
225+ 43:c8:a3:b0:df:d9:67:da:e2:ad:93:48:f8:a0:87:bd:79:14:
226+ e0:62:0a:df:f7:31:2e:31:7b:d1:32:2a:0a:fe:5d:14:ef:d9:
227+ 64:50:e4:83:91:bc:70:0d:d7:88:8d:d9:bc:84:0e:c5:1a:b3:
228+ bf:64:02:4e:51:91:a4:a2:85:15:83:af:f0:5b:9b:28:49:5f:
229+ b2:b3:03:d8
230
231=== modified file 'extra/yassl/certs/client-cert.der'
232Binary files extra/yassl/certs/client-cert.der 2012-02-10 14:33:27 +0000 and extra/yassl/certs/client-cert.der 2014-09-24 09:49:11 +0000 differ
233=== modified file 'extra/yassl/certs/client-cert.pem'
234--- extra/yassl/certs/client-cert.pem 2014-01-08 13:01:42 +0000
235+++ extra/yassl/certs/client-cert.pem 2014-09-24 09:49:11 +0000
236@@ -2,17 +2,17 @@
237 Data:
238 Version: 3 (0x2)
239 Serial Number:
240- 87:4a:75:be:91:66:d8:3d
241- Signature Algorithm: sha1WithRSAEncryption
242- Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=info@yassl.com
243+ b6:63:af:8f:5d:62:57:a0
244+ Signature Algorithm: sha1WithRSAEncryption
245+ Issuer: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
246 Validity
247- Not Before: Oct 24 18:21:55 2011 GMT
248- Not After : Jul 20 18:21:55 2014 GMT
249- Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=info@yassl.com
250+ Not Before: Jul 11 17:39:44 2014 GMT
251+ Not After : Apr 6 17:39:44 2017 GMT
252+ Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
253 Subject Public Key Info:
254 Public Key Algorithm: rsaEncryption
255- RSA Public Key: (2048 bit)
256- Modulus (2048 bit):
257+ Public-Key: (2048 bit)
258+ Modulus:
259 00:c3:03:d1:2b:fe:39:a4:32:45:3b:53:c8:84:2b:
260 2a:7c:74:9a:bd:aa:2a:52:07:47:d6:a6:36:b2:07:
261 32:8e:d0:ba:69:7b:c6:c3:44:9e:d4:81:48:fd:2d:
262@@ -37,51 +37,51 @@
263 33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
264 X509v3 Authority Key Identifier:
265 keyid:33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
266- DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=Programming/CN=www.yassl.com/emailAddress=info@yassl.com
267- serial:87:4A:75:BE:91:66:D8:3D
268+ DirName:/C=US/ST=Montana/L=Bozeman/O=wolfSSL/OU=Programming/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
269+ serial:B6:63:AF:8F:5D:62:57:A0
270
271 X509v3 Basic Constraints:
272 CA:TRUE
273 Signature Algorithm: sha1WithRSAEncryption
274- 1c:7c:42:81:29:9e:21:cf:d0:d8:c1:54:6f:cc:ae:14:09:38:
275- ff:68:98:9a:95:53:76:18:7b:e6:30:76:ec:28:0d:75:a7:de:
276- e0:cd:8e:d5:55:23:6a:47:2b:4e:8d:fc:7d:06:a3:d8:0f:ad:
277- 5e:d6:04:c9:00:33:fb:77:27:d3:b5:03:b3:7b:21:74:31:0b:
278- 4a:af:2d:1a:b3:93:8e:cc:f3:5f:3d:90:3f:cc:e3:55:19:91:
279- 7b:78:24:2e:4a:09:bb:18:4e:61:2d:9c:c6:0a:a0:34:91:88:
280- 70:6b:3b:48:47:bc:79:94:a2:a0:4d:32:47:54:c2:a3:dc:2e:
281- d2:51:4c:29:39:11:ff:e2:15:5e:58:97:36:f6:e9:06:06:86:
282- 0e:8d:9d:95:03:72:b2:8b:19:7c:e9:14:6e:a1:88:73:68:58:
283- 6d:71:5e:c2:d5:d3:13:d2:5f:de:ea:03:be:e2:00:40:e5:ce:
284- fd:e6:92:31:57:c3:eb:bb:66:ac:cb:2f:1a:fa:e0:62:a2:47:
285- f4:93:43:2a:4b:6c:5e:0a:2f:f9:e7:e6:4a:63:86:b0:ac:2a:
286- a1:eb:b4:5b:67:cd:32:e4:b6:11:4b:9a:72:66:0d:a2:4a:76:
287- 8f:fe:22:bc:83:fd:db:b7:d5:a9:ee:05:c9:b1:71:7e:1b:2b:
288- e1:e3:af:c0
289+ 85:10:90:c5:5d:de:25:8c:f2:57:7b:2d:14:1c:05:f9:71:63:
290+ 40:b0:e3:c1:c1:2e:13:2a:7a:b7:d6:24:58:87:eb:03:fb:0d:
291+ af:e0:f4:d0:c8:bc:51:36:10:4f:79:cc:4f:66:7d:af:99:cb:
292+ 7b:ce:68:94:c6:36:aa:42:6e:8c:78:5b:b2:85:ca:d1:e1:a8:
293+ 31:d1:81:d9:f9:c1:a3:9e:34:43:ef:0a:79:7d:3e:83:61:fc:
294+ 14:5c:d1:dd:bc:0e:d7:51:b7:71:6e:41:7e:8b:2c:5a:9a:cb:
295+ 77:4b:6a:f5:06:ff:02:af:1e:e6:63:4f:bc:44:d9:3f:56:9e:
296+ 09:9c:43:f9:55:21:32:46:82:09:86:a9:7b:74:1c:9e:5a:2a:
297+ bf:03:79:91:cb:f2:29:7f:c9:15:82:89:b9:53:cd:7e:07:90:
298+ a9:5d:76:e1:19:5e:0d:58:b8:59:d5:0d:df:23:ab:6b:63:76:
299+ 19:9e:9c:df:b0:57:49:6c:d0:86:97:c3:6c:3c:fa:e0:56:c2:
300+ 1b:e3:a1:42:1a:58:62:85:9d:74:19:83:08:af:59:90:f8:99:
301+ bd:67:d3:4a:ea:0e:c9:ca:61:8a:0d:8a:42:cc:90:e9:2e:c2:
302+ 54:73:7f:5e:af:8d:e2:32:cb:45:20:d6:19:4d:5b:77:31:cc:
303+ 0f:2d:c0:7e
304 -----BEGIN CERTIFICATE-----
305-MIIEmDCCA4CgAwIBAgIJAIdKdb6RZtg9MA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
306-VQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwG
307-A1UEChMFeWFTU0wxFDASBgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
308-eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMTEw
309-MjQxODIxNTVaFw0xNDA3MjAxODIxNTVaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
310-CBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDAS
311-BgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
312-KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
313-ADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9amNrIHMo7Quml7xsNE
314-ntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/Zcx/ZSRppugUiVvk
315-NPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE79fGjSjXk4c6W3xt+
316-v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX11JlJHOwzu8Zza7/
317-eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8lTMTRefRx04ZAGBOw
318-Y7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
319-M9hFZtdohxh+VA1wJ5HHJteFZcAwgcMGA1UdIwSBuzCBuIAUM9hFZtdohxh+VA1w
320-J5HHJteFZcChgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24x
321-ETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQKEwV5YVNTTDEUMBIGA1UECxMLUHJv
322-Z3JhbW1pbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEW
323-DmluZm9AeWFzc2wuY29tggkAh0p1vpFm2D0wDAYDVR0TBAUwAwEB/zANBgkqhkiG
324-9w0BAQUFAAOCAQEAHHxCgSmeIc/Q2MFUb8yuFAk4/2iYmpVTdhh75jB27CgNdafe
325-4M2O1VUjakcrTo38fQaj2A+tXtYEyQAz+3cn07UDs3shdDELSq8tGrOTjszzXz2Q
326-P8zjVRmRe3gkLkoJuxhOYS2cxgqgNJGIcGs7SEe8eZSioE0yR1TCo9wu0lFMKTkR
327-/+IVXliXNvbpBgaGDo2dlQNysosZfOkUbqGIc2hYbXFewtXTE9Jf3uoDvuIAQOXO
328-/eaSMVfD67tmrMsvGvrgYqJH9JNDKktsXgov+efmSmOGsKwqoeu0W2fNMuS2EUua
329-cmYNokp2j/4ivIP927fVqe4FybFxfhsr4eOvwA==
330+MIIEqjCCA5KgAwIBAgIJALZjr49dYlegMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
331+VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEQMA4G
332+A1UECgwHd29sZlNTTDEUMBIGA1UECwwLUHJvZ3JhbW1pbmcxGDAWBgNVBAMMD3d3
333+dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
334+Fw0xNDA3MTExNzM5NDRaFw0xNzA0MDYxNzM5NDRaMIGUMQswCQYDVQQGEwJVUzEQ
335+MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEQMA4GA1UECgwHd29s
336+ZlNTTDEUMBIGA1UECwwLUHJvZ3JhbW1pbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
337+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
338+hvcNAQEBBQADggEPADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9am
339+NrIHMo7Quml7xsNEntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/
340+Zcx/ZSRppugUiVvkNPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE7
341+9fGjSjXk4c6W3xt+v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX
342+11JlJHOwzu8Zza7/eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8l
343+TMTRefRx04ZAGBOwY7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB/DCB
344++TAdBgNVHQ4EFgQUM9hFZtdohxh+VA1wJ5HHJteFZcAwgckGA1UdIwSBwTCBvoAU
345+M9hFZtdohxh+VA1wJ5HHJteFZcChgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
346+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRAwDgYDVQQKDAd3b2xmU1NM
347+MRQwEgYDVQQLDAtQcm9ncmFtbWluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
348+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAtmOvj11iV6AwDAYD
349+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAhRCQxV3eJYzyV3stFBwF+XFj
350+QLDjwcEuEyp6t9YkWIfrA/sNr+D00Mi8UTYQT3nMT2Z9r5nLe85olMY2qkJujHhb
351+soXK0eGoMdGB2fnBo540Q+8KeX0+g2H8FFzR3bwO11G3cW5BfossWprLd0tq9Qb/
352+Aq8e5mNPvETZP1aeCZxD+VUhMkaCCYape3QcnloqvwN5kcvyKX/JFYKJuVPNfgeQ
353+qV124RleDVi4WdUN3yOra2N2GZ6c37BXSWzQhpfDbDz64FbCG+OhQhpYYoWddBmD
354+CK9ZkPiZvWfTSuoOycphig2KQsyQ6S7CVHN/Xq+N4jLLRSDWGU1bdzHMDy3Afg==
355 -----END CERTIFICATE-----
356
357=== modified file 'extra/yassl/certs/client-key.der'
358Binary files extra/yassl/certs/client-key.der 2012-02-10 14:33:27 +0000 and extra/yassl/certs/client-key.der 2014-09-24 09:49:11 +0000 differ
359=== modified file 'extra/yassl/certs/client-keyEnc.pem'
360--- extra/yassl/certs/client-keyEnc.pem 2014-01-08 13:01:42 +0000
361+++ extra/yassl/certs/client-keyEnc.pem 2014-09-24 09:49:11 +0000
362@@ -1,30 +1,12 @@
363 -----BEGIN RSA PRIVATE KEY-----
364 Proc-Type: 4,ENCRYPTED
365-DEK-Info: DES-CBC,B9D8FB94E38635AB
366+DEK-Info: DES-EDE3-CBC,BDE979D13CCC0ABD
367
368-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
400 -----END RSA PRIVATE KEY-----
401
402=== added file 'extra/yassl/certs/dsa1024.der'
403Binary files extra/yassl/certs/dsa1024.der 1970-01-01 00:00:00 +0000 and extra/yassl/certs/dsa1024.der 2014-09-24 09:49:11 +0000 differ
404=== added file 'extra/yassl/certs/dsa1024.pem'
405--- extra/yassl/certs/dsa1024.pem 1970-01-01 00:00:00 +0000
406+++ extra/yassl/certs/dsa1024.pem 2014-09-24 09:49:11 +0000
407@@ -0,0 +1,12 @@
408+-----BEGIN DSA PRIVATE KEY-----
409+MIIBvAIBAAKBgQC9Ue5KMuCKx+rG4epwxFFDzyoH4ccSwlglXsRdvqswDRK/oQvT
410+NNNoWiVxTn3kvQ8qDlhWy9KjGTrqr/ttgmh56FFpe6tz4yTgCNyR9D+eGclD7lNf
411+dPUc4E3SA6efopG6+ymI55bS+9xUFTG402UCrYSKT59zI2HBfuI6dltsxQIVAJHJ
412+7WDQ+jBn/nmMyCQzdi+0qJx1AoGBAJJacRK36s5yGY1b6qhxWqvpoAC+SfEKylZn
413+YWGYf2PM+Iwo6AgPKEw6BSsX+7Nmc4Gjyr4JWhComKi6onPamO/A2CbMM0DCxb47
414+BeLBWfqWAgXVj0CODT4MQos5yugnviR/YpEgbzLxvrXr469lKWsAyB19/gFmGmQW
415+cCgAwGm6AoGBAJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caa
416+DDa0XJ7ak6A7TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WX
417+S0kk3m/DHaC03ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVAhQ01VXa
418+Rr8IPem35lKghVKnq/kGQw==
419+-----END DSA PRIVATE KEY-----
420
421=== removed file 'extra/yassl/certs/dsa512.der'
422Binary files extra/yassl/certs/dsa512.der 2012-02-10 14:33:27 +0000 and extra/yassl/certs/dsa512.der 1970-01-01 00:00:00 +0000 differ
423=== removed file 'extra/yassl/certs/dsa512.pem'
424--- extra/yassl/certs/dsa512.pem 2006-05-03 11:08:24 +0000
425+++ extra/yassl/certs/dsa512.pem 1970-01-01 00:00:00 +0000
426@@ -1,8 +0,0 @@
427------BEGIN DSA PRIVATE KEY-----
428-MIH3AgEAAkEAmSlpgMk8mGhFqYL+Z+uViMW0DNYmRZUZLKAgW37faencww/zYQol
429-m/IhAWrNqow358pm21b0D3160Ri5Qv0bEQIVAK0lKasKnwkcwa0DIHZ/prfdTQMJ
430-AkASiJna59ALk5vm7jwhf5yztI2ljOI3gD8X0YFPvfBxtjIIVN2/AeKzdwZkdYoE
431-1nk5sQIDA8YGdOWQBQoQRhkxAkAEhKAmMXIM6E9dUxdisYDKwBZfwx7qxdmYOPm+
432-VlNHaM4IIlccuw13kc9bNu3zJIKQis2QfNt3+Rctc3Pvu7mCAhQjg+e+aqykxwwc
433-E2V27tjDFY02uA==
434------END DSA PRIVATE KEY-----
435
436=== modified file 'extra/yassl/certs/server-cert.pem'
437--- extra/yassl/certs/server-cert.pem 2014-01-08 13:01:42 +0000
438+++ extra/yassl/certs/server-cert.pem 2014-09-24 09:49:11 +0000
439@@ -1,17 +1,17 @@
440 Certificate:
441 Data:
442- Version: 1 (0x0)
443- Serial Number: 2 (0x2)
444- Signature Algorithm: sha1WithRSAEncryption
445- Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
446+ Version: 3 (0x2)
447+ Serial Number: 1 (0x1)
448+ Signature Algorithm: sha1WithRSAEncryption
449+ Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
450 Validity
451- Not Before: Oct 24 18:27:13 2011 GMT
452- Not After : Jul 20 18:27:13 2014 GMT
453- Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=Support, CN=www.yassl.com/emailAddress=info@yassl.com
454+ Not Before: Jul 11 17:20:14 2014 GMT
455+ Not After : Apr 6 17:20:14 2017 GMT
456+ Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Support, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
457 Subject Public Key Info:
458 Public Key Algorithm: rsaEncryption
459- RSA Public Key: (2048 bit)
460- Modulus (2048 bit):
461+ Public-Key: (2048 bit)
462+ Modulus:
463 00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
464 01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
465 f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
466@@ -31,59 +31,74 @@
467 a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
468 ad:d7
469 Exponent: 65537 (0x10001)
470+ X509v3 extensions:
471+ X509v3 Subject Key Identifier:
472+ B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
473+ X509v3 Authority Key Identifier:
474+ keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
475+ DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
476+ serial:9A:41:47:CD:A1:14:62:8C
477+
478+ X509v3 Basic Constraints:
479+ CA:TRUE
480 Signature Algorithm: sha1WithRSAEncryption
481- 71:4e:d3:62:df:cc:4c:f7:cd:b7:6e:52:0b:6c:6e:e0:bd:c2:
482- 2d:07:d7:c0:b0:6e:43:1e:35:bc:30:01:50:f0:ff:99:23:6c:
483- 18:1a:41:b6:11:d6:d4:19:61:fd:e4:77:97:1c:39:e1:57:ab:
484- c5:15:63:77:11:36:5e:74:e2:24:0b:1f:41:78:ad:b7:81:e7:
485- b4:40:66:80:f0:4b:91:a0:6d:a8:6e:3d:53:d9:8b:ce:2a:e1:
486- 0b:45:65:87:a1:96:ae:ee:3e:88:d5:12:1f:78:17:ae:2c:c5:
487- 73:44:d8:dc:f4:af:d8:cc:ae:4c:e1:0c:be:55:a4:99:f7:6e:
488- 96:c0:c8:45:87:bf:dc:51:57:ff:9e:73:37:6a:18:9c:c3:f9:
489- 22:7a:f4:b0:52:bd:fc:21:30:f8:c5:ff:1e:87:7d:ad:a2:5a:
490- 35:f5:22:a8:b4:0a:76:38:e6:76:b0:98:af:1b:ec:8a:0a:43:
491- 74:d2:85:34:37:84:07:e1:f6:23:b2:29:de:a6:b6:b7:4c:57:
492- 7e:96:06:cb:a9:16:25:29:3a:03:2d:55:7d:a6:8c:a4:f7:9e:
493- 81:c9:95:b6:7c:c1:4a:ce:94:66:0c:ca:88:eb:d2:09:f5:5b:
494- 19:58:82:df:27:fd:67:95:78:b7:02:06:d5:a7:61:bd:ef:3a:
495- fc:b2:61:cd
496+ 3d:8c:70:05:5b:62:4b:bf:6c:b6:48:61:01:10:1d:5e:05:ba:
497+ 55:94:2c:ae:59:6f:97:80:5d:6c:86:ec:9a:eb:15:45:44:e4:
498+ 56:f8:75:ca:8a:45:32:f4:c7:e1:fa:f2:98:1c:91:d3:3f:e8:
499+ 0e:c9:1b:fa:e1:79:99:67:0e:0d:6b:8a:ec:1a:2c:59:c4:34:
500+ 04:8d:39:77:cd:b5:e9:60:5b:82:bf:34:ce:ed:c6:4f:3f:b4:
501+ 5c:4d:8a:b4:f4:0a:04:12:a0:56:c1:e1:33:37:a1:54:87:48:
502+ e9:81:c2:0f:8f:6f:d3:52:4c:4c:32:4c:6b:9f:3a:04:8f:77:
503+ 5d:ad:dc:3d:2b:f2:c9:df:3c:60:5d:d8:fc:86:72:7c:3d:d0:
504+ 84:4b:8c:df:26:43:fe:c0:cc:5b:e1:36:b3:3d:32:28:a3:ef:
505+ 0c:20:d6:b1:50:39:d6:67:a9:8b:84:bc:92:34:eb:19:23:e8:
506+ 10:8f:ea:bd:18:8c:93:27:3c:74:75:8e:58:04:fa:2a:74:44:
507+ 7d:fc:4d:39:df:54:17:ba:78:e1:5d:6a:70:d3:7c:a2:80:81:
508+ e6:19:51:91:c3:44:51:ec:bb:88:a9:53:e1:d7:a9:8c:28:f4:
509+ 21:1c:42:51:09:b4:12:6d:a0:d6:25:09:85:c6:2a:0c:af:a7:
510+ 58:e6:52:8b
511 -----BEGIN CERTIFICATE-----
512-MIIDkDCCAngCAQIwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVTMRAwDgYD
513-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
514-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
515-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTExMDI0MTgyNzEzWhcN
516-MTQwNzIwMTgyNzEzWjCBijELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmEx
517-EDAOBgNVBAcTB0JvemVtYW4xDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwdTdXBw
518-b3J0MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZv
519-QHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFX
520-QfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/h
521-vXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4
522-pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo
523-3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4
524-D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHm
525-YYPF0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU7TYt/MTPfNt25S
526-C2xu4L3CLQfXwLBuQx41vDABUPD/mSNsGBpBthHW1Blh/eR3lxw54VerxRVjdxE2
527-XnTiJAsfQXitt4HntEBmgPBLkaBtqG49U9mLzirhC0Vlh6GWru4+iNUSH3gXrizF
528-c0TY3PSv2MyuTOEMvlWkmfdulsDIRYe/3FFX/55zN2oYnMP5Inr0sFK9/CEw+MX/
529-Hod9raJaNfUiqLQKdjjmdrCYrxvsigpDdNKFNDeEB+H2I7Ip3qa2t0xXfpYGy6kW
530-JSk6Ay1VfaaMpPeegcmVtnzBSs6UZgzKiOvSCfVbGViC3yf9Z5V4twIG1adhve86
531-/LJhzQ==
532+MIIEnjCCA4agAwIBAgIBATANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMCVVMx
533+EDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNh
534+d3Rvb3RoMRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYDVQQDDA93d3cud29sZnNz
535+bC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMTQwNzEx
536+MTcyMDE0WhcNMTcwNDA2MTcyMDE0WjCBkDELMAkGA1UEBhMCVVMxEDAOBgNVBAgM
537+B01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xEDAOBgNVBAoMB3dvbGZTU0wxEDAO
538+BgNVBAsMB1N1cHBvcnQxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqG
539+SIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
540+ADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hn
541+f/5cnFF194rKB+c1L4/hvXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/X
542+GQ0lT+FjY1GLC2Q/rUO4pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bM
543+QLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq
544+0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ
545+6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcCAwEAAaOB/DCB+TAdBgNVHQ4EFgQU
546+sxEyyZKYhOLJ+NA7bgNCyh8OjjwwgckGA1UdIwSBwTCBvoAUJ45nEXTDJh0/7TNj
547+s6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5h
548+MRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290aDETMBEGA1UECwwK
549+Q29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcN
550+AQkBFhBpbmZvQHdvbGZzc2wuY29tggkAmkFHzaEUYowwDAYDVR0TBAUwAwEB/zAN
551+BgkqhkiG9w0BAQUFAAOCAQEAPYxwBVtiS79stkhhARAdXgW6VZQsrllvl4BdbIbs
552+musVRUTkVvh1yopFMvTH4frymByR0z/oDskb+uF5mWcODWuK7BosWcQ0BI05d821
553+6WBbgr80zu3GTz+0XE2KtPQKBBKgVsHhMzehVIdI6YHCD49v01JMTDJMa586BI93
554+Xa3cPSvyyd88YF3Y/IZyfD3QhEuM3yZD/sDMW+E2sz0yKKPvDCDWsVA51mepi4S8
555+kjTrGSPoEI/qvRiMkyc8dHWOWAT6KnREffxNOd9UF7p44V1qcNN8ooCB5hlRkcNE
556+Uey7iKlT4depjCj0IRxCUQm0Em2g1iUJhcYqDK+nWOZSiw==
557 -----END CERTIFICATE-----
558 Certificate:
559 Data:
560 Version: 3 (0x2)
561 Serial Number:
562- e9:d0:a7:5f:79:25:f4:3c
563- Signature Algorithm: sha1WithRSAEncryption
564- Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
565+ 9a:41:47:cd:a1:14:62:8c
566+ Signature Algorithm: sha1WithRSAEncryption
567+ Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
568 Validity
569- Not Before: Oct 24 18:18:15 2011 GMT
570- Not After : Jul 20 18:18:15 2014 GMT
571- Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=info@yassl.com
572+ Not Before: Jul 11 03:20:08 2014 GMT
573+ Not After : Apr 6 03:20:08 2017 GMT
574+ Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
575 Subject Public Key Info:
576 Public Key Algorithm: rsaEncryption
577- RSA Public Key: (2048 bit)
578- Modulus (2048 bit):
579+ Public-Key: (2048 bit)
580+ Modulus:
581 00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
582 f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
583 de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
584@@ -104,54 +119,55 @@
585 36:79
586 Exponent: 65537 (0x10001)
587 X509v3 extensions:
588- X509v3 Subject Key Identifier:
589+ X509v3 Subject Key Identifier:
590 27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
591- X509v3 Authority Key Identifier:
592+ X509v3 Authority Key Identifier:
593 keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
594- DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=info@yassl.com
595- serial:E9:D0:A7:5F:79:25:F4:3C
596+ DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
597+ serial:9A:41:47:CD:A1:14:62:8C
598
599- X509v3 Basic Constraints:
600+ X509v3 Basic Constraints:
601 CA:TRUE
602 Signature Algorithm: sha1WithRSAEncryption
603- 5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
604- 4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
605- e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
606- f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
607- af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
608- 98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
609- 8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
610- 1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
611- 61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
612- 1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
613- 60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
614- 18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
615- f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
616- b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
617- 5a:1f:7f:ca
618+ 79:78:0c:6d:79:88:91:fc:3a:15:9c:f9:27:62:16:f0:21:1f:
619+ fa:7d:3f:a2:a8:32:1e:f7:f2:11:a9:74:16:74:5e:dc:18:ca:
620+ f0:00:2a:d5:03:06:26:30:f1:47:83:fd:32:6e:fc:ed:aa:4f:
621+ 7d:0c:63:60:31:2f:7c:0c:bf:99:66:87:ed:27:08:86:2d:c4:
622+ 33:e8:98:23:1c:fe:a3:db:9a:49:4e:fc:5a:42:ef:71:c3:3f:
623+ ad:dc:4a:a8:d2:a3:1d:09:ac:33:04:7b:86:f3:6d:00:59:a3:
624+ c8:db:d1:3c:73:f6:0e:90:d6:5e:49:e0:bf:36:63:08:7b:a5:
625+ b0:8f:35:3b:56:8c:11:35:49:04:1c:d0:e7:ba:56:c5:0d:0a:
626+ 91:8d:d6:b7:62:19:34:12:52:4c:d2:6d:7c:c5:3d:0f:18:81:
627+ 54:cb:f6:3c:e5:84:d2:d6:71:15:ec:1a:34:0b:f0:a0:21:74:
628+ 43:c8:a3:b0:df:d9:67:da:e2:ad:93:48:f8:a0:87:bd:79:14:
629+ e0:62:0a:df:f7:31:2e:31:7b:d1:32:2a:0a:fe:5d:14:ef:d9:
630+ 64:50:e4:83:91:bc:70:0d:d7:88:8d:d9:bc:84:0e:c5:1a:b3:
631+ bf:64:02:4e:51:91:a4:a2:85:15:83:af:f0:5b:9b:28:49:5f:
632+ b2:b3:03:d8
633 -----BEGIN CERTIFICATE-----
634-MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
635-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
636-A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
637-dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
638-MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
639-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
640-aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
641-MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
642-A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
643-8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
644-EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
645-dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
646-mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
647-CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
648-BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
649-P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
650-dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
651-BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
652-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
684+-----END CERTIFICATE-----
685
686=== modified file 'extra/yassl/certs/server-keyEnc.pem'
687--- extra/yassl/certs/server-keyEnc.pem 2014-01-08 13:01:42 +0000
688+++ extra/yassl/certs/server-keyEnc.pem 2014-09-24 09:49:11 +0000
689@@ -1,30 +1,30 @@
690 -----BEGIN RSA PRIVATE KEY-----
691 Proc-Type: 4,ENCRYPTED
692-DEK-Info: DES-CBC,08132C1FFF5BC8CC
693+DEK-Info: DES-CBC,136C7D8A69656668
694
695-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
745 -----END RSA PRIVATE KEY-----
746
747=== modified file 'extra/yassl/include/buffer.hpp'
748--- extra/yassl/include/buffer.hpp 2013-02-25 14:26:00 +0000
749+++ extra/yassl/include/buffer.hpp 2014-09-24 09:49:11 +0000
750@@ -1,5 +1,5 @@
751 /*
752- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
753+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
754
755 This program is free software; you can redistribute it and/or modify
756 it under the terms of the GNU General Public License as published by
757@@ -48,7 +48,11 @@
758
759
760 struct NoCheck {
761- void check(uint, uint);
762+ int check(uint, uint);
763+};
764+
765+struct Check {
766+ int check(uint, uint);
767 };
768
769 /* input_buffer operates like a smart c style array with a checking option,
770@@ -60,11 +64,13 @@
771 * write to the buffer bulk wise and have the correct size
772 */
773
774-class input_buffer : public NoCheck {
775+class input_buffer : public Check {
776 uint size_; // number of elements in buffer
777 uint current_; // current offset position in buffer
778 byte* buffer_; // storage for buffer
779 byte* end_; // end of storage marker
780+ int error_; // error number
781+ byte zero_; // for returning const reference to zero byte
782 public:
783 input_buffer();
784
785@@ -93,6 +99,10 @@
786
787 uint get_remaining() const;
788
789+ int get_error() const;
790+
791+ void set_error();
792+
793 void set_current(uint i);
794
795 // read only access through [], advance current
796@@ -103,7 +113,7 @@
797 bool eof();
798
799 // peek ahead
800- byte peek() const;
801+ byte peek();
802
803 // write function, should use at/near construction
804 void assign(const byte* t, uint s);
805
806=== modified file 'extra/yassl/include/openssl/ssl.h'
807--- extra/yassl/include/openssl/ssl.h 2014-02-06 05:46:55 +0000
808+++ extra/yassl/include/openssl/ssl.h 2014-09-24 09:49:11 +0000
809@@ -35,7 +35,7 @@
810 #include "rsa.h"
811
812
813-#define YASSL_VERSION "2.3.0"
814+#define YASSL_VERSION "2.3.4"
815
816
817 #if defined(__cplusplus)
818
819=== modified file 'extra/yassl/src/buffer.cpp'
820--- extra/yassl/src/buffer.cpp 2013-02-26 05:35:17 +0000
821+++ extra/yassl/src/buffer.cpp 2014-09-24 09:49:11 +0000
822@@ -1,5 +1,5 @@
823 /*
824- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
825+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
826
827 This program is free software; you can redistribute it and/or modify
828 it under the terms of the GNU General Public License as published by
829@@ -32,8 +32,19 @@
830
831
832
833-void NoCheck::check(uint, uint)
834-{
835+/* return 0 on check success, always true for NoCheck policy */
836+int NoCheck::check(uint, uint)
837+{
838+ return 0;
839+}
840+
841+/* return 0 on check success */
842+int Check::check(uint i, uint max)
843+{
844+ if (i < max)
845+ return 0;
846+
847+ return -1;
848 }
849
850
851@@ -48,18 +59,20 @@
852
853
854 input_buffer::input_buffer()
855- : size_(0), current_(0), buffer_(0), end_(0)
856+ : size_(0), current_(0), buffer_(0), end_(0), error_(0), zero_(0)
857 {}
858
859
860 input_buffer::input_buffer(uint s)
861- : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s)
862+ : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
863+ error_(0), zero_(0)
864 {}
865
866
867 // with assign
868 input_buffer::input_buffer(uint s, const byte* t, uint len)
869- : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s)
870+ : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
871+ error_(0), zero_(0)
872 {
873 assign(t, len);
874 }
875@@ -74,8 +87,10 @@
876 // users can pass defualt zero length buffer and then allocate
877 void input_buffer::allocate(uint s)
878 {
879- buffer_ = NEW_YS byte[s];
880- end_ = buffer_ + s;
881+ if (error_ == 0) {
882+ buffer_ = NEW_YS byte[s];
883+ end_ = buffer_ + s;
884+ }
885 }
886
887
888@@ -90,40 +105,67 @@
889 // if you know the size before the write use assign()
890 void input_buffer::add_size(uint i)
891 {
892- check(size_ + i-1, get_capacity());
893- size_ += i;
894+ if (error_ == 0 && check(size_ + i-1, get_capacity()) == 0)
895+ size_ += i;
896+ else
897+ error_ = -1;
898 }
899
900
901 uint input_buffer::get_capacity() const
902 {
903- return (uint) (end_ - buffer_);
904+ if (error_ == 0)
905+ return end_ - buffer_;
906+
907+ return 0;
908 }
909
910
911 uint input_buffer::get_current() const
912 {
913- return current_;
914+ if (error_ == 0)
915+ return current_;
916+
917+ return 0;
918 }
919
920
921 uint input_buffer::get_size() const
922 {
923- return size_;
924+ if (error_ == 0)
925+ return size_;
926+
927+ return 0;
928 }
929
930
931 uint input_buffer::get_remaining() const
932 {
933- return size_ - current_;
934+ if (error_ == 0)
935+ return size_ - current_;
936+
937+ return 0;
938+}
939+
940+
941+int input_buffer::get_error() const
942+{
943+ return error_;
944+}
945+
946+
947+void input_buffer::set_error()
948+{
949+ error_ = -1;
950 }
951
952
953 void input_buffer::set_current(uint i)
954 {
955- if (i)
956- check(i - 1, size_);
957- current_ = i;
958+ if (error_ == 0 && i && check(i - 1, size_) == 0)
959+ current_ = i;
960+ else
961+ error_ = -1;
962 }
963
964
965@@ -131,40 +173,59 @@
966 // user passes in AUTO index for ease of use
967 const byte& input_buffer::operator[](uint i)
968 {
969- check(current_, size_);
970- return buffer_[current_++];
971+ if (error_ == 0 && check(current_, size_) == 0)
972+ return buffer_[current_++];
973+
974+ error_ = -1;
975+ return zero_;
976 }
977
978
979 // end of input test
980 bool input_buffer::eof()
981 {
982+ if (error_ != 0)
983+ return true;
984+
985 return current_ >= size_;
986 }
987
988
989 // peek ahead
990-byte input_buffer::peek() const
991+byte input_buffer::peek()
992 {
993- return buffer_[current_];
994+ if (error_ == 0 && check(current_, size_) == 0)
995+ return buffer_[current_];
996+
997+ error_ = -1;
998+ return 0;
999 }
1000
1001
1002 // write function, should use at/near construction
1003 void input_buffer::assign(const byte* t, uint s)
1004 {
1005- check(current_, get_capacity());
1006- add_size(s);
1007- memcpy(&buffer_[current_], t, s);
1008+ if (t && error_ == 0 && check(current_, get_capacity()) == 0) {
1009+ add_size(s);
1010+ if (error_ == 0) {
1011+ memcpy(&buffer_[current_], t, s);
1012+ return; // success
1013+ }
1014+ }
1015+
1016+ error_ = -1;
1017 }
1018
1019
1020 // use read to query input, adjusts current
1021 void input_buffer::read(byte* dst, uint length)
1022 {
1023- check(current_ + length - 1, size_);
1024- memcpy(dst, &buffer_[current_], length);
1025- current_ += length;
1026+ if (dst && error_ == 0 && check(current_ + length - 1, size_) == 0) {
1027+ memcpy(dst, &buffer_[current_], length);
1028+ current_ += length;
1029+ } else {
1030+ error_ = -1;
1031+ }
1032 }
1033
1034
1035
1036=== modified file 'extra/yassl/src/handshake.cpp'
1037--- extra/yassl/src/handshake.cpp 2014-01-08 13:01:42 +0000
1038+++ extra/yassl/src/handshake.cpp 2014-09-24 09:49:11 +0000
1039@@ -522,7 +522,7 @@
1040 // some clients still send sslv2 client hello
1041 void ProcessOldClientHello(input_buffer& input, SSL& ssl)
1042 {
1043- if (input.get_remaining() < 2) {
1044+ if (input.get_error() || input.get_remaining() < 2) {
1045 ssl.SetError(bad_input);
1046 return;
1047 }
1048@@ -549,20 +549,24 @@
1049
1050 byte len[2];
1051
1052- input.read(len, sizeof(len));
1053+ len[0] = input[AUTO];
1054+ len[1] = input[AUTO];
1055 ato16(len, ch.suite_len_);
1056
1057- input.read(len, sizeof(len));
1058+ len[0] = input[AUTO];
1059+ len[1] = input[AUTO];
1060 uint16 sessionLen;
1061 ato16(len, sessionLen);
1062 ch.id_len_ = sessionLen;
1063
1064- input.read(len, sizeof(len));
1065+ len[0] = input[AUTO];
1066+ len[1] = input[AUTO];
1067 uint16 randomLen;
1068 ato16(len, randomLen);
1069
1070- if (ch.suite_len_ > MAX_SUITE_SZ || sessionLen > ID_LEN ||
1071- randomLen > RAN_LEN) {
1072+ if (input.get_error() || ch.suite_len_ > MAX_SUITE_SZ ||
1073+ ch.suite_len_ > input.get_remaining() ||
1074+ sessionLen > ID_LEN || randomLen > RAN_LEN) {
1075 ssl.SetError(bad_input);
1076 return;
1077 }
1078@@ -580,13 +584,12 @@
1079 ch.suite_len_ = j;
1080
1081 if (ch.id_len_)
1082- input.read(ch.session_id_, ch.id_len_);
1083+ input.read(ch.session_id_, ch.id_len_); // id_len_ from sessionLen
1084
1085 if (randomLen < RAN_LEN)
1086 memset(ch.random_, 0, RAN_LEN - randomLen);
1087 input.read(&ch.random_[RAN_LEN - randomLen], randomLen);
1088
1089-
1090 ch.Process(input, ssl);
1091 }
1092
1093@@ -787,6 +790,9 @@
1094 ssl.verifyState(hdr);
1095 }
1096
1097+ if (ssl.GetError())
1098+ return 0;
1099+
1100 // make sure we have enough input in buffer to process this record
1101 if (needHdr || hdr.length_ > buffer.get_remaining()) {
1102 // put header in front for next time processing
1103@@ -799,6 +805,9 @@
1104
1105 while (buffer.get_current() < hdr.length_ + RECORD_HEADER + offset) {
1106 // each message in record, can be more than 1 if not encrypted
1107+ if (ssl.GetError())
1108+ return 0;
1109+
1110 if (ssl.getSecurity().get_parms().pending_ == false) { // cipher on
1111 // sanity check for malicious/corrupted/illegal input
1112 if (buffer.get_remaining() < hdr.length_) {
1113
1114=== modified file 'extra/yassl/src/yassl_imp.cpp'
1115--- extra/yassl/src/yassl_imp.cpp 2014-01-08 13:01:42 +0000
1116+++ extra/yassl/src/yassl_imp.cpp 2014-09-24 09:49:11 +0000
1117@@ -220,16 +220,26 @@
1118 // read PreMaster secret and decrypt, server side
1119 void EncryptedPreMasterSecret::read(SSL& ssl, input_buffer& input)
1120 {
1121+ if (input.get_error()) {
1122+ ssl.SetError(bad_input);
1123+ return;
1124+ }
1125+
1126 const CertManager& cert = ssl.getCrypto().get_certManager();
1127 RSA rsa(cert.get_privateKey(), cert.get_privateKeyLength(), false);
1128 uint16 cipherLen = rsa.get_cipherLength();
1129 if (ssl.isTLS()) {
1130 byte len[2];
1131- input.read(len, sizeof(len));
1132+ len[0] = input[AUTO];
1133+ len[1] = input[AUTO];
1134 ato16(len, cipherLen);
1135 }
1136 alloc(cipherLen);
1137 input.read(secret_, length_);
1138+ if (input.get_error()) {
1139+ ssl.SetError(bad_input);
1140+ return;
1141+ }
1142
1143 opaque preMasterSecret[SECRET_LEN];
1144 rsa.decrypt(preMasterSecret, secret_, length_,
1145@@ -277,6 +287,11 @@
1146 // read client's public key, server side
1147 void ClientDiffieHellmanPublic::read(SSL& ssl, input_buffer& input)
1148 {
1149+ if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
1150+ ssl.SetError(bad_input);
1151+ return;
1152+ }
1153+
1154 DiffieHellman& dh = ssl.useCrypto().use_dh();
1155
1156 uint16 keyLength;
1157@@ -287,6 +302,10 @@
1158
1159 alloc(keyLength);
1160 input.read(Yc_, keyLength);
1161+ if (input.get_error()) {
1162+ ssl.SetError(bad_input);
1163+ return;
1164+ }
1165 dh.makeAgreement(Yc_, keyLength);
1166
1167 // because of encoding, first byte might be 0, don't use for preMaster
1168@@ -331,6 +350,10 @@
1169 // read server's p, g, public key and sig, client side
1170 void DH_Server::read(SSL& ssl, input_buffer& input)
1171 {
1172+ if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
1173+ ssl.SetError(bad_input);
1174+ return;
1175+ }
1176 uint16 length, messageTotal = 6; // pSz + gSz + pubSz
1177 byte tmp[2];
1178
1179@@ -341,6 +364,10 @@
1180 messageTotal += length;
1181
1182 input.read(parms_.alloc_p(length), length);
1183+ if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
1184+ ssl.SetError(bad_input);
1185+ return;
1186+ }
1187
1188 // g
1189 tmp[0] = input[AUTO];
1190@@ -349,6 +376,10 @@
1191 messageTotal += length;
1192
1193 input.read(parms_.alloc_g(length), length);
1194+ if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
1195+ ssl.SetError(bad_input);
1196+ return;
1197+ }
1198
1199 // pub
1200 tmp[0] = input[AUTO];
1201@@ -357,12 +388,20 @@
1202 messageTotal += length;
1203
1204 input.read(parms_.alloc_pub(length), length);
1205+ if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
1206+ ssl.SetError(bad_input);
1207+ return;
1208+ }
1209
1210 // save message for hash verify
1211 input_buffer message(messageTotal);
1212 input.set_current(input.get_current() - messageTotal);
1213 input.read(message.get_buffer(), messageTotal);
1214 message.add_size(messageTotal);
1215+ if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
1216+ ssl.SetError(bad_input);
1217+ return;
1218+ }
1219
1220 // signature
1221 tmp[0] = input[AUTO];
1222@@ -371,6 +410,10 @@
1223
1224 signature_ = NEW_YS byte[length];
1225 input.read(signature_, length);
1226+ if (input.get_error()) {
1227+ ssl.SetError(bad_input);
1228+ return;
1229+ }
1230
1231 // verify signature
1232 byte hash[FINISHED_SZ];
1233@@ -645,6 +688,10 @@
1234 {
1235 ssl.verifyState(*this);
1236 if (ssl.GetError()) return;
1237+ if (input.get_error()) {
1238+ ssl.SetError(bad_input);
1239+ return;
1240+ }
1241 const HandShakeFactory& hsf = ssl.getFactory().getHandShake();
1242 mySTL::auto_ptr<HandShakeBase> hs(hsf.CreateObject(type_));
1243 if (!hs.get()) {
1244@@ -810,8 +857,13 @@
1245
1246
1247 // CipherSpec processing handler
1248-void ChangeCipherSpec::Process(input_buffer&, SSL& ssl)
1249+void ChangeCipherSpec::Process(input_buffer& input, SSL& ssl)
1250 {
1251+ if (input.get_error()) {
1252+ ssl.SetError(bad_input);
1253+ return;
1254+ }
1255+
1256 ssl.useSecurity().use_parms().pending_ = false;
1257 if (ssl.getSecurity().get_resuming()) {
1258 if (ssl.getSecurity().get_parms().entity_ == client_end)
1259@@ -873,6 +925,11 @@
1260 // Alert processing handler
1261 void Alert::Process(input_buffer& input, SSL& ssl)
1262 {
1263+ if (input.get_error()) {
1264+ ssl.SetError(bad_input);
1265+ return;
1266+ }
1267+
1268 if (ssl.getSecurity().get_parms().pending_ == false) { // encrypted alert
1269 int aSz = get_length(); // alert size already read on input
1270 opaque verify[SHA_LEN];
1271@@ -890,12 +947,19 @@
1272
1273 if (ssl.getSecurity().get_parms().cipher_type_ == block) {
1274 int ivExtra = 0;
1275+ opaque fill;
1276
1277 if (ssl.isTLSv1_1())
1278 ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
1279 int padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
1280 aSz - digestSz;
1281- input.set_current(input.get_current() + padSz);
1282+ for (int i = 0; i < padSz; i++)
1283+ fill = input[AUTO];
1284+ }
1285+
1286+ if (input.get_error()) {
1287+ ssl.SetError(bad_input);
1288+ return;
1289 }
1290
1291 // verify
1292@@ -1112,6 +1176,11 @@
1293 // Process handler for Data
1294 void Data::Process(input_buffer& input, SSL& ssl)
1295 {
1296+ if (input.get_error()) {
1297+ ssl.SetError(bad_input);
1298+ return;
1299+ }
1300+
1301 int msgSz = ssl.getSecurity().get_parms().encrypt_size_;
1302 int pad = 0, padSz = 0;
1303 int ivExtra = 0;
1304@@ -1154,7 +1223,7 @@
1305
1306 int dataSz = msgSz - ivExtra - digestSz - pad - padSz;
1307
1308- if (dataSz < 0) {
1309+ if (dataSz < 0 || dataSz > (MAX_RECORD_SIZE + COMPRESS_EXTRA)) {
1310 ssl.SetError(bad_input);
1311 return;
1312 }
1313@@ -1180,6 +1249,10 @@
1314
1315 // advance past mac and fill
1316 input.set_current(input.get_current() + digestSz + pad + padSz);
1317+ if (input.get_error()) {
1318+ ssl.SetError(bad_input);
1319+ return;
1320+ }
1321 }
1322
1323
1324@@ -1244,6 +1317,11 @@
1325 // certificate processing handler
1326 void Certificate::Process(input_buffer& input, SSL& ssl)
1327 {
1328+ if (input.get_error()) {
1329+ ssl.SetError(bad_input);
1330+ return;
1331+ }
1332+
1333 CertManager& cm = ssl.useCrypto().use_certManager();
1334
1335 uint32 list_sz;
1336@@ -1412,6 +1490,10 @@
1337
1338 // Session
1339 hello.id_len_ = input[AUTO];
1340+ if (hello.id_len_ > ID_LEN) {
1341+ input.set_error();
1342+ return input;
1343+ }
1344 if (hello.id_len_)
1345 input.read(hello.session_id_, hello.id_len_);
1346
1347@@ -1452,8 +1534,13 @@
1348
1349
1350 // Server Hello processing handler
1351-void ServerHello::Process(input_buffer&, SSL& ssl)
1352+void ServerHello::Process(input_buffer& input, SSL& ssl)
1353 {
1354+ if (input.get_error()) {
1355+ ssl.SetError(bad_input);
1356+ return;
1357+ }
1358+
1359 if (ssl.GetMultiProtocol()) { // SSLv23 support
1360 if (ssl.isTLS() && server_version_.minor_ < 1)
1361 // downgrade to SSLv3
1362@@ -1547,8 +1634,12 @@
1363
1364
1365 // Server Hello Done processing handler
1366-void ServerHelloDone::Process(input_buffer&, SSL& ssl)
1367+void ServerHelloDone::Process(input_buffer& input, SSL& ssl)
1368 {
1369+ if (input.get_error()) {
1370+ ssl.SetError(bad_input);
1371+ return;
1372+ }
1373 ssl.useStates().useClient() = serverHelloDoneComplete;
1374 }
1375
1376@@ -1667,8 +1758,13 @@
1377
1378
1379 // Client Hello processing handler
1380-void ClientHello::Process(input_buffer&, SSL& ssl)
1381+void ClientHello::Process(input_buffer& input, SSL& ssl)
1382 {
1383+ if (input.get_error()) {
1384+ ssl.SetError(bad_input);
1385+ return;
1386+ }
1387+
1388 // store version for pre master secret
1389 ssl.useSecurity().use_connection().chVersion_ = client_version_;
1390
1391@@ -1800,9 +1896,17 @@
1392 // Server Key Exchange processing handler
1393 void ServerKeyExchange::Process(input_buffer& input, SSL& ssl)
1394 {
1395+ if (input.get_error()) {
1396+ ssl.SetError(bad_input);
1397+ return;
1398+ }
1399 createKey(ssl);
1400 if (ssl.GetError()) return;
1401 server_key_->read(ssl, input);
1402+ if (input.get_error()) {
1403+ ssl.SetError(bad_input);
1404+ return;
1405+ }
1406
1407 ssl.useStates().useClient() = serverKeyExchangeComplete;
1408 }
1409@@ -1924,18 +2028,24 @@
1410 {
1411 // types
1412 request.typeTotal_ = input[AUTO];
1413+ if (request.typeTotal_ > CERT_TYPES) {
1414+ input.set_error();
1415+ return input;
1416+ }
1417 for (int i = 0; i < request.typeTotal_; i++)
1418 request.certificate_types_[i] = ClientCertificateType(input[AUTO]);
1419
1420- byte tmp[REQUEST_HEADER];
1421- input.read(tmp, sizeof(tmp));
1422+ byte tmp[2];
1423+ tmp[0] = input[AUTO];
1424+ tmp[1] = input[AUTO];
1425 uint16 sz;
1426 ato16(tmp, sz);
1427
1428 // authorities
1429 while (sz) {
1430 uint16 dnSz;
1431- input.read(tmp, sizeof(tmp));
1432+ tmp[0] = input[AUTO];
1433+ tmp[1] = input[AUTO];
1434 ato16(tmp, dnSz);
1435
1436 DistinguishedName dn;
1437@@ -1945,6 +2055,9 @@
1438 input.read(&dn[REQUEST_HEADER], dnSz);
1439
1440 sz -= dnSz + REQUEST_HEADER;
1441+
1442+ if (input.get_error())
1443+ break;
1444 }
1445
1446 return input;
1447@@ -1983,8 +2096,12 @@
1448
1449
1450 // CertificateRequest processing handler
1451-void CertificateRequest::Process(input_buffer&, SSL& ssl)
1452+void CertificateRequest::Process(input_buffer& input, SSL& ssl)
1453 {
1454+ if (input.get_error()) {
1455+ ssl.SetError(bad_input);
1456+ return;
1457+ }
1458 CertManager& cm = ssl.useCrypto().use_certManager();
1459
1460 cm.setSendVerify();
1461@@ -2067,7 +2184,8 @@
1462 input_buffer& operator>>(input_buffer& input, CertificateVerify& request)
1463 {
1464 byte tmp[VERIFY_HEADER];
1465- input.read(tmp, sizeof(tmp));
1466+ tmp[0] = input[AUTO];
1467+ tmp[1] = input[AUTO];
1468
1469 uint16 sz = 0;
1470 ato16(tmp, sz);
1471@@ -2091,8 +2209,13 @@
1472
1473
1474 // CertificateVerify processing handler
1475-void CertificateVerify::Process(input_buffer&, SSL& ssl)
1476+void CertificateVerify::Process(input_buffer& input, SSL& ssl)
1477 {
1478+ if (input.get_error()) {
1479+ ssl.SetError(bad_input);
1480+ return;
1481+ }
1482+
1483 const Hashes& hashVerify = ssl.getHashes().get_certVerify();
1484 const CertManager& cert = ssl.getCrypto().get_certManager();
1485
1486@@ -2131,9 +2254,17 @@
1487 // Client Key Exchange processing handler
1488 void ClientKeyExchange::Process(input_buffer& input, SSL& ssl)
1489 {
1490+ if (input.get_error()) {
1491+ ssl.SetError(bad_input);
1492+ return;
1493+ }
1494 createKey(ssl);
1495 if (ssl.GetError()) return;
1496 client_key_->read(ssl, input);
1497+ if (input.get_error()) {
1498+ ssl.SetError(bad_input);
1499+ return;
1500+ }
1501
1502 if (ssl.getCrypto().get_certManager().verifyPeer())
1503 build_certHashes(ssl, ssl.useHashes().use_certVerify());
1504@@ -2220,11 +2351,19 @@
1505 // Finished processing handler
1506 void Finished::Process(input_buffer& input, SSL& ssl)
1507 {
1508+ if (input.get_error()) {
1509+ ssl.SetError(bad_input);
1510+ return;
1511+ }
1512 // verify hashes
1513 const Finished& verify = ssl.getHashes().get_verify();
1514 uint finishedSz = ssl.isTLS() ? TLS_FINISHED_SZ : FINISHED_SZ;
1515
1516 input.read(hashes_.md5_, finishedSz);
1517+ if (input.get_error()) {
1518+ ssl.SetError(bad_input);
1519+ return;
1520+ }
1521
1522 if (memcmp(&hashes_, &verify.hashes_, finishedSz)) {
1523 ssl.SetError(verify_error);
1524@@ -2246,19 +2385,23 @@
1525 opaque mac[SHA_LEN]; // max size
1526 int digestSz = ssl.getCrypto().get_digest().get_digestSize();
1527 input.read(mac, digestSz);
1528+ if (input.get_error()) {
1529+ ssl.SetError(bad_input);
1530+ return;
1531+ }
1532
1533 uint ivExtra = 0;
1534 if (ssl.getSecurity().get_parms().cipher_type_ == block)
1535 if (ssl.isTLSv1_1())
1536 ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
1537
1538+ opaque fill;
1539 int padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
1540 HANDSHAKE_HEADER - finishedSz - digestSz;
1541- input.set_current(input.get_current() + padSz);
1542-
1543- // verify mac
1544- if (memcmp(mac, verifyMAC, digestSz)) {
1545- ssl.SetError(verify_error);
1546+ for (int i = 0; i < padSz; i++)
1547+ fill = input[AUTO];
1548+ if (input.get_error()) {
1549+ ssl.SetError(bad_input);
1550 return;
1551 }
1552
1553
1554=== modified file 'extra/yassl/src/yassl_int.cpp'
1555--- extra/yassl/src/yassl_int.cpp 2012-03-02 12:23:52 +0000
1556+++ extra/yassl/src/yassl_int.cpp 2014-09-24 09:49:11 +0000
1557@@ -1,5 +1,5 @@
1558 /*
1559- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1560+ Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
1561
1562 This program is free software; you can redistribute it and/or modify
1563 it under the terms of the GNU General Public License as published by
1564@@ -2534,8 +2534,9 @@
1565 int DeCompress(input_buffer& in, int sz, input_buffer& out)
1566 {
1567 byte tmp[LENGTH_SZ];
1568-
1569- in.read(tmp, sizeof(tmp));
1570+
1571+ tmp[0] = in[AUTO];
1572+ tmp[1] = in[AUTO];
1573
1574 uint16 len;
1575 ato16(tmp, len);
1576
1577=== modified file 'extra/yassl/taocrypt/include/asn.hpp'
1578--- extra/yassl/taocrypt/include/asn.hpp 2014-05-22 08:56:09 +0000
1579+++ extra/yassl/taocrypt/include/asn.hpp 2014-09-24 09:49:11 +0000
1580@@ -1,5 +1,5 @@
1581 /*
1582- Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
1583+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1584
1585 This program is free software; you can redistribute it and/or modify
1586 it under the terms of the GNU General Public License as published by
1587@@ -111,7 +111,7 @@
1588 MAX_LENGTH_SZ = 5,
1589 MAX_SEQ_SZ = 5, // enum(seq|con) + length(4)
1590 MAX_ALGO_SIZE = 9,
1591- MAX_DIGEST_SZ = 25, // SHA + enum(Bit or Octet) + length(4)
1592+ MAX_DIGEST_SZ = 69, // SHA512 + enum(Bit or Octet) + length(4)
1593 DSA_SIG_SZ = 40,
1594 ASN_NAME_MAX = 512 // max total of all included names
1595 };
1596@@ -257,8 +257,11 @@
1597
1598
1599 enum ContentType { HUH = 651 };
1600-enum SigType { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA =649};
1601-enum HashType { MD2h = 646, MD5h = 649, SHAh = 88 };
1602+enum SigType { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA = 649,
1603+ SHA256wRSA = 655, SHA384wRSA = 656, SHA512wRSA = 657,
1604+ SHA256wDSA = 416 };
1605+enum HashType { MD2h = 646, MD5h = 649, SHAh = 88, SHA256h = 414, SHA384h = 415,
1606+ SHA512h = 416 };
1607 enum KeyType { DSAk = 515, RSAk = 645 }; // sums of algo OID
1608
1609
1610
1611=== modified file 'extra/yassl/taocrypt/include/block.hpp'
1612--- extra/yassl/taocrypt/include/block.hpp 2013-02-26 05:35:17 +0000
1613+++ extra/yassl/taocrypt/include/block.hpp 2014-09-24 09:49:11 +0000
1614@@ -1,5 +1,5 @@
1615 /*
1616- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1617+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1618
1619 This program is free software; you can redistribute it and/or modify
1620 it under the terms of the GNU General Public License as published by
1621@@ -74,7 +74,7 @@
1622 if (preserve) {
1623 A b = A();
1624 typename A::pointer newPointer = b.allocate(newSize, 0);
1625- memcpy(newPointer, p, sizeof(T) * min((word32) oldSize, (word32) newSize));
1626+ memcpy(newPointer, p, sizeof(T) * min(oldSize, newSize));
1627 a.deallocate(p, oldSize);
1628 STL::swap(a, b);
1629 return newPointer;
1630@@ -186,9 +186,9 @@
1631
1632 ~Block() { allocator_.deallocate(buffer_, sz_); }
1633 private:
1634+ A allocator_;
1635 word32 sz_; // size in Ts
1636 T* buffer_;
1637- A allocator_;
1638 };
1639
1640
1641
1642=== modified file 'extra/yassl/taocrypt/include/integer.hpp'
1643--- extra/yassl/taocrypt/include/integer.hpp 2014-02-06 05:46:55 +0000
1644+++ extra/yassl/taocrypt/include/integer.hpp 2014-09-24 09:49:11 +0000
1645@@ -1,5 +1,5 @@
1646 /*
1647- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
1648+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1649
1650 This program is free software; you can redistribute it and/or modify
1651 it under the terms of the GNU General Public License as published by
1652@@ -47,7 +47,7 @@
1653
1654 #ifdef TAOCRYPT_X86ASM_AVAILABLE
1655 #if defined(__GNUC__) && (__GNUC__ >= 4)
1656- // GCC 4 or greater optimizes too much inline on recursive for bigint,
1657+ // GCC 4 or greater optimizes too much inline on recursive for bigint,
1658 // -O3 just as fast without asm here anyway
1659 #undef TAOCRYPT_X86ASM_AVAILABLE
1660 #endif
1661
1662=== modified file 'extra/yassl/taocrypt/include/pwdbased.hpp'
1663--- extra/yassl/taocrypt/include/pwdbased.hpp 2013-02-26 05:35:17 +0000
1664+++ extra/yassl/taocrypt/include/pwdbased.hpp 2014-09-24 09:49:11 +0000
1665@@ -1,5 +1,5 @@
1666 /*
1667- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
1668+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1669
1670 This program is free software; you can redistribute it and/or modify
1671 it under the terms of the GNU General Public License as published by
1672@@ -16,6 +16,7 @@
1673 MA 02110-1301 USA.
1674 */
1675
1676+
1677 /* pwdbased.hpp defines PBKDF2 from PKCS #5
1678 */
1679
1680@@ -48,10 +49,7 @@
1681 word32 pLen, const byte* salt, word32 sLen,
1682 word32 iterations) const
1683 {
1684- if (dLen > MaxDerivedKeyLength())
1685- return 0;
1686-
1687- if (iterations < 0)
1688+ if (dLen > MaxDerivedKeyLength())
1689 return 0;
1690
1691 ByteBlock buffer(T::DIGEST_SIZE);
1692
1693=== modified file 'extra/yassl/taocrypt/include/runtime.hpp'
1694--- extra/yassl/taocrypt/include/runtime.hpp 2013-02-26 05:35:17 +0000
1695+++ extra/yassl/taocrypt/include/runtime.hpp 2014-09-24 09:49:11 +0000
1696@@ -1,5 +1,5 @@
1697 /*
1698- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1699+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1700
1701 This program is free software; you can redistribute it and/or modify
1702 it under the terms of the GNU General Public License as published by
1703@@ -34,7 +34,10 @@
1704
1705 // Handler for pure virtual functions
1706 namespace __Crun {
1707- void pure_error(void);
1708+ static void pure_error(void)
1709+ {
1710+ // "Pure virtual method called, Aborted", GCC 4.2 str cmp fix
1711+ }
1712 } // namespace __Crun
1713
1714 #endif // __sun
1715@@ -48,7 +51,15 @@
1716 #if defined(DO_TAOCRYPT_KERNEL_MODE)
1717 #include "kernelc.hpp"
1718 #endif
1719- int __cxa_pure_virtual () __attribute__ ((weak));
1720+
1721+/* Disallow inline __cxa_pure_virtual() */
1722+static int __cxa_pure_virtual() __attribute__((noinline, used));
1723+static int __cxa_pure_virtual()
1724+{
1725+ // oops, pure virtual called!
1726+ return 0;
1727+}
1728+
1729 } // extern "C"
1730
1731 #endif // __GNUC__ > 2
1732
1733=== modified file 'extra/yassl/taocrypt/include/sha.hpp'
1734--- extra/yassl/taocrypt/include/sha.hpp 2014-02-17 12:49:04 +0000
1735+++ extra/yassl/taocrypt/include/sha.hpp 2014-09-24 09:49:11 +0000
1736@@ -1,6 +1,5 @@
1737 /*
1738- Copyright (C) 2000-2007 MySQL AB
1739- Use is subject to license terms
1740+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1741
1742 This program is free software; you can redistribute it and/or modify
1743 it under the terms of the GNU General Public License as published by
1744@@ -159,6 +158,12 @@
1745 void Transform();
1746 };
1747
1748+enum { MAX_SHA2_DIGEST_SIZE = 64 }; // SHA512
1749+
1750+#else
1751+
1752+enum { MAX_SHA2_DIGEST_SIZE = 32 }; // SHA256
1753+
1754 #endif // WORD64_AVAILABLE
1755
1756
1757
1758=== modified file 'extra/yassl/taocrypt/src/aes.cpp'
1759--- extra/yassl/taocrypt/src/aes.cpp 2014-02-06 05:46:55 +0000
1760+++ extra/yassl/taocrypt/src/aes.cpp 2014-09-24 09:49:11 +0000
1761@@ -1,5 +1,5 @@
1762 /*
1763- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1764+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1765
1766 This program is free software; you can redistribute it and/or modify
1767 it under the terms of the GNU General Public License as published by
1768@@ -66,7 +66,7 @@
1769 in += BLOCK_SIZE;
1770 }
1771 }
1772- else {
1773+ else {
1774 while (blocks--) {
1775 AsmDecrypt(in, out, (void*)Td0);
1776
1777@@ -79,8 +79,8 @@
1778 out += BLOCK_SIZE;
1779 in += BLOCK_SIZE;
1780 }
1781- }
1782- }
1783+ }
1784+ }
1785 }
1786
1787 #endif // DO_AES_ASM
1788@@ -466,14 +466,13 @@
1789 "movd mm7, ebp;" \
1790 "movd mm4, eax;" \
1791 "mov ebp, edx;" \
1792- "sub esp, 4;"
1793-
1794+ "sub esp, 4;"
1795 #define EPILOG() \
1796 "add esp, 4;" \
1797 "pop ebp;" \
1798 "pop ebx;" \
1799- "emms;" \
1800- ".att_syntax;" \
1801+ "emms;" \
1802+ ".att_syntax;" \
1803 : \
1804 : "c" (this), "S" (inBlock), "d" (boxes), "a" (outBlock) \
1805 : "%edi", "memory", "cc" \
1806@@ -834,9 +833,9 @@
1807
1808
1809 #ifdef _MSC_VER
1810- __declspec(naked)
1811+ __declspec(naked)
1812 #else
1813- __attribute__ ((noinline))
1814+ __attribute__ ((noinline))
1815 #endif
1816 void AES::AsmDecrypt(const byte* inBlock, byte* outBlock, void* boxes) const
1817 {
1818
1819=== modified file 'extra/yassl/taocrypt/src/algebra.cpp'
1820--- extra/yassl/taocrypt/src/algebra.cpp 2013-02-26 05:35:17 +0000
1821+++ extra/yassl/taocrypt/src/algebra.cpp 2014-09-24 09:49:11 +0000
1822@@ -1,5 +1,5 @@
1823 /*
1824- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1825+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1826
1827 This program is free software; you can redistribute it and/or modify
1828 it under the terms of the GNU General Public License as published by
1829@@ -186,10 +186,10 @@
1830
1831 struct WindowSlider
1832 {
1833- WindowSlider(const Integer &expIn, bool fastNegateIn,
1834+ WindowSlider(const Integer &exp, bool fastNegate,
1835 unsigned int windowSizeIn=0)
1836- : exp(expIn), windowModulus(Integer::One()), windowSize(windowSizeIn),
1837- windowBegin(0), fastNegate(fastNegateIn), firstTime(true),
1838+ : exp(exp), windowModulus(Integer::One()), windowSize(windowSizeIn),
1839+ windowBegin(0), fastNegate(fastNegate), firstTime(true),
1840 finished(false)
1841 {
1842 if (windowSize == 0)
1843
1844=== modified file 'extra/yassl/taocrypt/src/arc4.cpp'
1845--- extra/yassl/taocrypt/src/arc4.cpp 2014-02-06 05:46:55 +0000
1846+++ extra/yassl/taocrypt/src/arc4.cpp 2014-09-24 09:49:11 +0000
1847@@ -1,5 +1,5 @@
1848 /*
1849- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
1850+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1851
1852 This program is free software; you can redistribute it and/or modify
1853 it under the terms of the GNU General Public License as published by
1854@@ -121,12 +121,11 @@
1855 "push ebx;" \
1856 "push ebp;" \
1857 "mov ebp, eax;"
1858-
1859 #define EPILOG() \
1860 "pop ebp;" \
1861 "pop ebx;" \
1862- "emms;" \
1863- ".att_syntax;" \
1864+ "emms;" \
1865+ ".att_syntax;" \
1866 : \
1867 : "c" (this), "D" (out), "S" (in), "a" (length) \
1868 : "%edx", "memory", "cc" \
1869@@ -180,7 +179,7 @@
1870 #ifdef _MSC_VER
1871 AS1( loopStart: ) // loopStart
1872 #else
1873- AS1( 0: ) // loopStart for some gas (need numeric for jump back
1874+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
1875 #endif
1876
1877 // y = (y+a) & 0xff;
1878@@ -232,7 +231,7 @@
1879
1880 AS1( nothing: )
1881
1882- // inline adjust
1883+ // inline adjust
1884 AS2( add esp, 4 ) // fix room on stack
1885
1886 EPILOG()
1887
1888=== modified file 'extra/yassl/taocrypt/src/asn.cpp'
1889--- extra/yassl/taocrypt/src/asn.cpp 2013-05-23 08:39:28 +0000
1890+++ extra/yassl/taocrypt/src/asn.cpp 2014-09-24 09:49:11 +0000
1891@@ -1,6 +1,5 @@
1892 /*
1893- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1894- Use is subject to license terms.
1895+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1896
1897 This program is free software; you can redistribute it and/or modify
1898 it under the terms of the GNU General Public License as published by
1899@@ -761,7 +760,7 @@
1900 while (source_.get_index() < length) {
1901 GetSet();
1902 if (source_.GetError().What() == SET_E) {
1903- source_.SetError(NO_ERROR_E); // extensions may only have sequence
1904+ source_.SetError(NO_ERROR_E); // extensions may only have sequence
1905 source_.prev();
1906 }
1907 GetSequence();
1908@@ -832,10 +831,8 @@
1909 if (source_.IsLeft(length) == false) return;
1910
1911 if (email) {
1912- if (!(ptr = AddTag(ptr, buf_end, "/emailAddress=", 14, length))) {
1913- source_.SetError(CONTENT_E);
1914- return;
1915- }
1916+ if (!(ptr = AddTag(ptr, buf_end, "/emailAddress=", 14, length)))
1917+ return;
1918 }
1919
1920 source_.advance(length);
1921@@ -972,12 +969,26 @@
1922 hasher.reset(NEW_TC SHA);
1923 ht = SHAh;
1924 }
1925+ else if (signatureOID_ == SHA256wRSA || signatureOID_ == SHA256wDSA) {
1926+ hasher.reset(NEW_TC SHA256);
1927+ ht = SHA256h;
1928+ }
1929+#ifdef WORD64_AVAILABLE
1930+ else if (signatureOID_ == SHA384wRSA) {
1931+ hasher.reset(NEW_TC SHA384);
1932+ ht = SHA384h;
1933+ }
1934+ else if (signatureOID_ == SHA512wRSA) {
1935+ hasher.reset(NEW_TC SHA512);
1936+ ht = SHA512h;
1937+ }
1938+#endif
1939 else {
1940 source_.SetError(UNKOWN_SIG_E);
1941 return false;
1942 }
1943
1944- byte digest[SHA::DIGEST_SIZE]; // largest size
1945+ byte digest[MAX_SHA2_DIGEST_SIZE]; // largest size
1946
1947 hasher->Update(source_.get_buffer() + certBegin_, sigIndex_ - certBegin_);
1948 hasher->Final(digest);
1949@@ -1050,6 +1061,12 @@
1950 0x02, 0x05, 0x05, 0x00 };
1951 static const byte md2AlgoID[] = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
1952 0x02, 0x02, 0x05, 0x00};
1953+ static const byte sha256AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
1954+ 0x04, 0x02, 0x01, 0x05, 0x00 };
1955+ static const byte sha384AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
1956+ 0x04, 0x02, 0x02, 0x05, 0x00 };
1957+ static const byte sha512AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
1958+ 0x04, 0x02, 0x03, 0x05, 0x00 };
1959
1960 int algoSz = 0;
1961 const byte* algoName = 0;
1962@@ -1060,6 +1077,21 @@
1963 algoName = shaAlgoID;
1964 break;
1965
1966+ case SHA256h:
1967+ algoSz = sizeof(sha256AlgoID);
1968+ algoName = sha256AlgoID;
1969+ break;
1970+
1971+ case SHA384h:
1972+ algoSz = sizeof(sha384AlgoID);
1973+ algoName = sha384AlgoID;
1974+ break;
1975+
1976+ case SHA512h:
1977+ algoSz = sizeof(sha512AlgoID);
1978+ algoName = sha512AlgoID;
1979+ break;
1980+
1981 case MD2h:
1982 algoSz = sizeof(md2AlgoID);
1983 algoName = md2AlgoID;
1984
1985=== modified file 'extra/yassl/taocrypt/src/blowfish.cpp'
1986--- extra/yassl/taocrypt/src/blowfish.cpp 2014-02-06 05:46:55 +0000
1987+++ extra/yassl/taocrypt/src/blowfish.cpp 2014-09-24 09:49:11 +0000
1988@@ -1,5 +1,5 @@
1989 /*
1990- Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
1991+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1992
1993 This program is free software; you can redistribute it and/or modify
1994 it under the terms of the GNU General Public License as published by
1995@@ -237,8 +237,8 @@
1996 #define EPILOG() \
1997 "pop ebp;" \
1998 "pop ebx;" \
1999- "emms;" \
2000- ".att_syntax;" \
2001+ "emms;" \
2002+ ".att_syntax;" \
2003 : \
2004 : "c" (this), "S" (inBlock), "a" (outBlock) \
2005 : "%edi", "%edx", "memory", "cc" \
2006@@ -291,7 +291,7 @@
2007
2008
2009 #ifdef _MSC_VER
2010- __declspec(naked)
2011+ __declspec(naked)
2012 #else
2013 __attribute__ ((noinline))
2014 #endif
2015
2016=== modified file 'extra/yassl/taocrypt/src/des.cpp'
2017--- extra/yassl/taocrypt/src/des.cpp 2014-02-17 12:49:04 +0000
2018+++ extra/yassl/taocrypt/src/des.cpp 2014-09-24 09:49:11 +0000
2019@@ -1,6 +1,5 @@
2020 /*
2021- Copyright (C) 2000-2007 MySQL AB
2022- Use is subject to license terms
2023+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2024
2025 This program is free software; you can redistribute it and/or modify
2026 it under the terms of the GNU General Public License as published by
2027@@ -642,9 +641,9 @@
2028
2029
2030 #ifdef _MSC_VER
2031- __declspec(naked)
2032+ __declspec(naked)
2033 #else
2034- __attribute__ ((noinline))
2035+ __attribute__ ((noinline))
2036 #endif
2037 void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
2038 {
2039@@ -664,8 +663,8 @@
2040 #define EPILOG() \
2041 "pop ebp;" \
2042 "pop ebx;" \
2043- "emms;" \
2044- ".att_syntax;" \
2045+ "emms;" \
2046+ ".att_syntax;" \
2047 : \
2048 : "d" (this), "S" (in), "a" (box), "c" (out) \
2049 : "%edi", "memory", "cc" \
2050
2051=== modified file 'extra/yassl/taocrypt/src/integer.cpp'
2052--- extra/yassl/taocrypt/src/integer.cpp 2014-02-06 05:46:55 +0000
2053+++ extra/yassl/taocrypt/src/integer.cpp 2014-09-24 09:49:11 +0000
2054@@ -1,5 +1,5 @@
2055 /*
2056- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2057+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2058
2059 This program is free software; you can redistribute it and/or modify
2060 it under the terms of the GNU General Public License as published by
2061@@ -56,9 +56,8 @@
2062 #endif
2063 #elif defined(_MSC_VER) && defined(_M_IX86)
2064 /* #pragma message("You do not seem to have the Visual C++ Processor Pack ")
2065- #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
2066-*/
2067 #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
2068+*/
2069 #elif defined(__GNUC__) && defined(__i386__)
2070 /* #warning You do not have GCC 3.3 or later, or did not specify the -msse2 \
2071 compiler option. Use of SSE2 intrinsics will be disabled.
2072@@ -282,23 +281,21 @@
2073 word GetHighHalfAsBorrow() const {return 0-halfs_.high;}
2074
2075 private:
2076- struct dword_struct
2077- {
2078- #ifdef LITTLE_ENDIAN_ORDER
2079- word low;
2080- word high;
2081- #else
2082- word high;
2083- word low;
2084- #endif
2085- };
2086-
2087 union
2088 {
2089 #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
2090 dword whole_;
2091 #endif
2092- struct dword_struct halfs_;
2093+ struct
2094+ {
2095+ #ifdef LITTLE_ENDIAN_ORDER
2096+ word low;
2097+ word high;
2098+ #else
2099+ word high;
2100+ word low;
2101+ #endif
2102+ } halfs_;
2103 };
2104 };
2105
2106@@ -1201,24 +1198,20 @@
2107 #define AS1(x) #x ";"
2108 #define AS2(x, y) #x ", " #y ";"
2109 #define AddPrologue \
2110- word res; \
2111 __asm__ __volatile__ \
2112 ( \
2113 "push %%ebx;" /* save this manually, in case of -fPIC */ \
2114- "mov %3, %%ebx;" \
2115+ "mov %2, %%ebx;" \
2116 ".intel_syntax noprefix;" \
2117 "push ebp;"
2118 #define AddEpilogue \
2119 "pop ebp;" \
2120 ".att_syntax prefix;" \
2121 "pop %%ebx;" \
2122- "mov %%eax, %0;" \
2123- : "=g" (res) \
2124+ : \
2125 : "c" (C), "d" (A), "m" (B), "S" (N) \
2126 : "%edi", "memory", "cc" \
2127- ); \
2128- return res;
2129-
2130+ );
2131 #define MulPrologue \
2132 __asm__ __volatile__ \
2133 ( \
2134
2135=== modified file 'extra/yassl/taocrypt/src/md5.cpp'
2136--- extra/yassl/taocrypt/src/md5.cpp 2014-02-06 05:46:55 +0000
2137+++ extra/yassl/taocrypt/src/md5.cpp 2014-09-24 09:49:11 +0000
2138@@ -1,5 +1,5 @@
2139 /*
2140- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
2141+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2142
2143 This program is free software; you can redistribute it and/or modify
2144 it under the terms of the GNU General Public License as published by
2145@@ -223,7 +223,7 @@
2146
2147
2148 #ifdef _MSC_VER
2149- __declspec(naked)
2150+ __declspec(naked)
2151 #else
2152 __attribute__ ((noinline))
2153 #endif
2154@@ -242,8 +242,8 @@
2155 #define EPILOG() \
2156 "pop ebp;" \
2157 "pop ebx;" \
2158- "emms;" \
2159- ".att_syntax;" \
2160+ "emms;" \
2161+ ".att_syntax;" \
2162 : \
2163 : "c" (this), "D" (data), "a" (times) \
2164 : "%esi", "%edx", "memory", "cc" \
2165@@ -297,7 +297,7 @@
2166 #ifdef _MSC_VER
2167 AS1( loopStart: ) // loopStart
2168 #else
2169- AS1( 0: ) // loopStart for some gas (need numeric for jump back
2170+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
2171 #endif
2172
2173 // set up
2174
2175=== modified file 'extra/yassl/taocrypt/src/misc.cpp'
2176--- extra/yassl/taocrypt/src/misc.cpp 2013-02-26 05:35:17 +0000
2177+++ extra/yassl/taocrypt/src/misc.cpp 2014-09-24 09:49:11 +0000
2178@@ -1,5 +1,5 @@
2179 /*
2180- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2181+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2182
2183 This program is free software; you can redistribute it and/or modify
2184 it under the terms of the GNU General Public License as published by
2185@@ -84,17 +84,7 @@
2186
2187 }
2188
2189-#ifdef __sun
2190-
2191-// Handler for pure virtual functions
2192-namespace __Crun {
2193- void pure_error() {
2194- }
2195-}
2196-
2197-#endif
2198-
2199-#if defined(__ICC) || defined(__INTEL_COMPILER) || (__GNUC__ > 2)
2200+#if defined(__ICC) || defined(__INTEL_COMPILER)
2201
2202 extern "C" {
2203
2204@@ -175,6 +165,14 @@
2205
2206 #ifdef TAOCRYPT_X86ASM_AVAILABLE
2207
2208+#ifndef _MSC_VER
2209+ static jmp_buf s_env;
2210+ static void SigIllHandler(int)
2211+ {
2212+ longjmp(s_env, 1);
2213+ }
2214+#endif
2215+
2216
2217 bool HaveCpuId()
2218 {
2219
2220=== modified file 'extra/yassl/taocrypt/src/rabbit.cpp'
2221--- extra/yassl/taocrypt/src/rabbit.cpp 2014-02-06 05:46:55 +0000
2222+++ extra/yassl/taocrypt/src/rabbit.cpp 2014-09-24 09:49:11 +0000
2223@@ -1,15 +1,15 @@
2224 /*
2225- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2226-
2227+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2228+
2229 This program is free software; you can redistribute it and/or modify
2230 it under the terms of the GNU General Public License as published by
2231 the Free Software Foundation; version 2 of the License.
2232-
2233+
2234 This program is distributed in the hope that it will be useful,
2235 but WITHOUT ANY WARRANTY; without even the implied warranty of
2236 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2237 GNU General Public License for more details.
2238-
2239+
2240 You should have received a copy of the GNU General Public License
2241 along with this program; see the file COPYING. If not, write to the
2242 Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
2243@@ -236,7 +236,7 @@
2244 NextState(Work);
2245
2246 /* Generate 16 bytes of pseudo-random data */
2247- tmp[0] = LITTLE32(workCtx_.x[0] ^
2248+ tmp[0] = LITTLE32(workCtx_.x[0] ^
2249 (workCtx_.x[5]>>16) ^ U32V(workCtx_.x[3]<<16));
2250 tmp[1] = LITTLE32(workCtx_.x[2] ^
2251 (workCtx_.x[7]>>16) ^ U32V(workCtx_.x[5]<<16));
2252
2253=== modified file 'extra/yassl/taocrypt/src/random.cpp'
2254--- extra/yassl/taocrypt/src/random.cpp 2013-02-26 05:35:17 +0000
2255+++ extra/yassl/taocrypt/src/random.cpp 2014-09-24 09:49:11 +0000
2256@@ -1,5 +1,5 @@
2257 /*
2258- Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2259+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2260
2261 This program is free software; you can redistribute it and/or modify
2262 it under the terms of the GNU General Public License as published by
2263@@ -27,6 +27,7 @@
2264 #include <time.h>
2265
2266 #if defined(_WIN32)
2267+ #define _WIN32_WINNT 0x0400
2268 #include <windows.h>
2269 #include <wincrypt.h>
2270 #else
2271
2272=== modified file 'extra/yassl/taocrypt/src/ripemd.cpp'
2273--- extra/yassl/taocrypt/src/ripemd.cpp 2014-02-06 05:46:55 +0000
2274+++ extra/yassl/taocrypt/src/ripemd.cpp 2014-09-24 09:49:11 +0000
2275@@ -1,5 +1,5 @@
2276 /*
2277- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
2278+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2279
2280 This program is free software; you can redistribute it and/or modify
2281 it under the terms of the GNU General Public License as published by
2282@@ -507,6 +507,8 @@
2283
2284 #ifdef _MSC_VER
2285 __declspec(naked)
2286+#else
2287+ __attribute__ ((noinline))
2288 #endif
2289 void RIPEMD160::AsmTransform(const byte* data, word32 times)
2290 {
2291@@ -520,12 +522,11 @@
2292 ".intel_syntax noprefix;" \
2293 "push ebx;" \
2294 "push ebp;"
2295-
2296 #define EPILOG() \
2297 "pop ebp;" \
2298 "pop ebx;" \
2299- "emms;" \
2300- ".att_syntax;" \
2301+ "emms;" \
2302+ ".att_syntax;" \
2303 : \
2304 : "c" (this), "D" (data), "d" (times) \
2305 : "%esi", "%eax", "memory", "cc" \
2306@@ -571,7 +572,7 @@
2307 #ifdef _MSC_VER
2308 AS1( loopStart: ) // loopStart
2309 #else
2310- AS1( 0: ) // loopStart for some gas (need numeric for jump back
2311+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
2312 #endif
2313
2314 AS2( movd mm2, edx ) // store times_
2315@@ -830,7 +831,7 @@
2316 AS1( jnz 0b ) // loopStart
2317 #endif
2318
2319- // inline adjust
2320+ // inline adjust
2321 AS2( add esp, 24 ) // fix room on stack
2322
2323 EPILOG()
2324
2325=== modified file 'extra/yassl/taocrypt/src/sha.cpp'
2326--- extra/yassl/taocrypt/src/sha.cpp 2014-02-06 05:46:55 +0000
2327+++ extra/yassl/taocrypt/src/sha.cpp 2014-09-24 09:49:11 +0000
2328@@ -1,5 +1,5 @@
2329 /*
2330- Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
2331+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2332
2333 This program is free software; you can redistribute it and/or modify
2334 it under the terms of the GNU General Public License as published by
2335@@ -776,12 +776,11 @@
2336 ".intel_syntax noprefix;" \
2337 "push ebx;" \
2338 "push ebp;"
2339-
2340 #define EPILOG() \
2341 "pop ebp;" \
2342 "pop ebx;" \
2343- "emms;" \
2344- ".att_syntax;" \
2345+ "emms;" \
2346+ ".att_syntax;" \
2347 : \
2348 : "c" (this), "D" (data), "a" (times) \
2349 : "%esi", "%edx", "memory", "cc" \
2350@@ -830,7 +829,7 @@
2351 #ifdef _MSC_VER
2352 AS1( loopStart: ) // loopStart
2353 #else
2354- AS1( 0: ) // loopStart for some gas (need numeric for jump back
2355+ AS1( 0: ) // loopStart for some gas (need numeric for jump back
2356 #endif
2357
2358 // byte reverse 16 words of input, 4 at a time, put on stack for W[]
2359@@ -1022,7 +1021,7 @@
2360 AS1( jnz 0b ) // loopStart
2361 #endif
2362
2363- // inline adjust
2364+ // inline adjust
2365 AS2( add esp, 68 ) // fix room on stack
2366
2367 EPILOG()
2368
2369=== modified file 'extra/yassl/taocrypt/src/twofish.cpp'
2370--- extra/yassl/taocrypt/src/twofish.cpp 2014-02-06 05:46:55 +0000
2371+++ extra/yassl/taocrypt/src/twofish.cpp 2014-09-24 09:49:11 +0000
2372@@ -1,5 +1,5 @@
2373 /*
2374- Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
2375+ Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
2376
2377 This program is free software; you can redistribute it and/or modify
2378 it under the terms of the GNU General Public License as published by
2379@@ -285,12 +285,11 @@
2380 "push ebp;" \
2381 "movd mm3, eax;" \
2382 "movd mm6, ebp;"
2383-
2384 #define EPILOG() \
2385 "pop ebp;" \
2386 "pop ebx;" \
2387- "emms;" \
2388- ".att_syntax;" \
2389+ "emms;" \
2390+ ".att_syntax;" \
2391 : \
2392 : "D" (this), "S" (inBlock), "a" (outBlock) \
2393 : "%ecx", "%edx", "memory", "cc" \
2394@@ -479,7 +478,7 @@
2395 AS2( movd ebp, mm6 )
2396 AS2( movd esi, mm0 ) // k_
2397 #ifdef __GNUC__
2398- AS2( movd edi, mm3 ) // outBlock
2399+ AS2( movd edi, mm3 ) // outBlock
2400 #else
2401 AS2( mov edi, [ebp + 12] ) // outBlock
2402 #endif
2403@@ -500,7 +499,7 @@
2404
2405
2406 #ifdef _MSC_VER
2407- __declspec(naked)
2408+ __declspec(naked)
2409 #else
2410 __attribute__ ((noinline))
2411 #endif
2412@@ -551,7 +550,7 @@
2413 AS2( movd ebp, mm6 )
2414 AS2( movd esi, mm0 ) // k_
2415 #ifdef __GNUC__
2416- AS2( movd edi, mm3 ) // outBlock
2417+ AS2( movd edi, mm3 ) // outBlock
2418 #else
2419 AS2( mov edi, [ebp + 12] ) // outBlock
2420 #endif
2421
2422=== modified file 'man/comp_err.1'
2423--- man/comp_err.1 2014-08-22 09:58:37 +0000
2424+++ man/comp_err.1 2014-09-24 09:49:11 +0000
2425@@ -2,12 +2,12 @@
2426 .\" Title: \fBcomp_err\fR
2427 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2428 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2429-.\" Date: 07/18/2014
2430+.\" Date: 09/06/2014
2431 .\" Manual: MySQL Database System
2432 .\" Source: MySQL 5.5
2433 .\" Language: English
2434 .\"
2435-.TH "\FBCOMP_ERR\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2436+.TH "\FBCOMP_ERR\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2437 .\" -----------------------------------------------------------------
2438 .\" * Define some portability stuff
2439 .\" -----------------------------------------------------------------
2440
2441=== modified file 'man/innochecksum.1'
2442--- man/innochecksum.1 2014-08-22 09:58:37 +0000
2443+++ man/innochecksum.1 2014-09-24 09:49:11 +0000
2444@@ -2,12 +2,12 @@
2445 .\" Title: \fBinnochecksum\fR
2446 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2447 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2448-.\" Date: 07/18/2014
2449+.\" Date: 09/06/2014
2450 .\" Manual: MySQL Database System
2451 .\" Source: MySQL 5.5
2452 .\" Language: English
2453 .\"
2454-.TH "\FBINNOCHECKSUM\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2455+.TH "\FBINNOCHECKSUM\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2456 .\" -----------------------------------------------------------------
2457 .\" * Define some portability stuff
2458 .\" -----------------------------------------------------------------
2459
2460=== modified file 'man/msql2mysql.1'
2461--- man/msql2mysql.1 2014-08-22 09:58:37 +0000
2462+++ man/msql2mysql.1 2014-09-24 09:49:11 +0000
2463@@ -2,12 +2,12 @@
2464 .\" Title: \fBmsql2mysql\fR
2465 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2466 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2467-.\" Date: 07/18/2014
2468+.\" Date: 09/06/2014
2469 .\" Manual: MySQL Database System
2470 .\" Source: MySQL 5.5
2471 .\" Language: English
2472 .\"
2473-.TH "\FBMSQL2MYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2474+.TH "\FBMSQL2MYSQL\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2475 .\" -----------------------------------------------------------------
2476 .\" * Define some portability stuff
2477 .\" -----------------------------------------------------------------
2478
2479=== modified file 'man/my_print_defaults.1'
2480--- man/my_print_defaults.1 2014-08-22 09:58:37 +0000
2481+++ man/my_print_defaults.1 2014-09-24 09:49:11 +0000
2482@@ -2,12 +2,12 @@
2483 .\" Title: \fBmy_print_defaults\fR
2484 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2485 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2486-.\" Date: 07/18/2014
2487+.\" Date: 09/06/2014
2488 .\" Manual: MySQL Database System
2489 .\" Source: MySQL 5.5
2490 .\" Language: English
2491 .\"
2492-.TH "\FBMY_PRINT_DEFAULTS" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2493+.TH "\FBMY_PRINT_DEFAULTS" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2494 .\" -----------------------------------------------------------------
2495 .\" * Define some portability stuff
2496 .\" -----------------------------------------------------------------
2497
2498=== modified file 'man/myisam_ftdump.1'
2499--- man/myisam_ftdump.1 2014-08-22 09:58:37 +0000
2500+++ man/myisam_ftdump.1 2014-09-24 09:49:11 +0000
2501@@ -2,12 +2,12 @@
2502 .\" Title: \fBmyisam_ftdump\fR
2503 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2504 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2505-.\" Date: 07/18/2014
2506+.\" Date: 09/06/2014
2507 .\" Manual: MySQL Database System
2508 .\" Source: MySQL 5.5
2509 .\" Language: English
2510 .\"
2511-.TH "\FBMYISAM_FTDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2512+.TH "\FBMYISAM_FTDUMP\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2513 .\" -----------------------------------------------------------------
2514 .\" * Define some portability stuff
2515 .\" -----------------------------------------------------------------
2516
2517=== modified file 'man/myisamchk.1'
2518--- man/myisamchk.1 2014-08-22 09:58:37 +0000
2519+++ man/myisamchk.1 2014-09-24 09:49:11 +0000
2520@@ -2,12 +2,12 @@
2521 .\" Title: \fBmyisamchk\fR
2522 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2523 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2524-.\" Date: 07/18/2014
2525+.\" Date: 09/06/2014
2526 .\" Manual: MySQL Database System
2527 .\" Source: MySQL 5.5
2528 .\" Language: English
2529 .\"
2530-.TH "\FBMYISAMCHK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2531+.TH "\FBMYISAMCHK\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2532 .\" -----------------------------------------------------------------
2533 .\" * Define some portability stuff
2534 .\" -----------------------------------------------------------------
2535
2536=== modified file 'man/myisamlog.1'
2537--- man/myisamlog.1 2014-08-22 09:58:37 +0000
2538+++ man/myisamlog.1 2014-09-24 09:49:11 +0000
2539@@ -2,12 +2,12 @@
2540 .\" Title: \fBmyisamlog\fR
2541 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2542 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2543-.\" Date: 07/18/2014
2544+.\" Date: 09/06/2014
2545 .\" Manual: MySQL Database System
2546 .\" Source: MySQL 5.5
2547 .\" Language: English
2548 .\"
2549-.TH "\FBMYISAMLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2550+.TH "\FBMYISAMLOG\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2551 .\" -----------------------------------------------------------------
2552 .\" * Define some portability stuff
2553 .\" -----------------------------------------------------------------
2554
2555=== modified file 'man/myisampack.1'
2556--- man/myisampack.1 2014-08-22 09:58:37 +0000
2557+++ man/myisampack.1 2014-09-24 09:49:11 +0000
2558@@ -2,12 +2,12 @@
2559 .\" Title: \fBmyisampack\fR
2560 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2561 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2562-.\" Date: 07/18/2014
2563+.\" Date: 09/06/2014
2564 .\" Manual: MySQL Database System
2565 .\" Source: MySQL 5.5
2566 .\" Language: English
2567 .\"
2568-.TH "\FBMYISAMPACK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2569+.TH "\FBMYISAMPACK\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2570 .\" -----------------------------------------------------------------
2571 .\" * Define some portability stuff
2572 .\" -----------------------------------------------------------------
2573
2574=== modified file 'man/mysql-stress-test.pl.1'
2575--- man/mysql-stress-test.pl.1 2014-08-22 09:58:37 +0000
2576+++ man/mysql-stress-test.pl.1 2014-09-24 09:49:11 +0000
2577@@ -2,12 +2,12 @@
2578 .\" Title: \fBmysql-stress-test.pl\fR
2579 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2580 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2581-.\" Date: 07/04/2014
2582+.\" Date: 09/05/2014
2583 .\" Manual: MySQL Database System
2584 .\" Source: MySQL
2585 .\" Language: English
2586 .\"
2587-.TH "\FBMYSQL\-STRESS\-TE" "1" "07/04/2014" "MySQL" "MySQL Database System"
2588+.TH "\FBMYSQL\-STRESS\-TE" "1" "09/05/2014" "MySQL" "MySQL Database System"
2589 .\" -----------------------------------------------------------------
2590 .\" * Define some portability stuff
2591 .\" -----------------------------------------------------------------
2592
2593=== modified file 'man/mysql-test-run.pl.1'
2594--- man/mysql-test-run.pl.1 2014-08-22 09:58:37 +0000
2595+++ man/mysql-test-run.pl.1 2014-09-24 09:49:11 +0000
2596@@ -2,12 +2,12 @@
2597 .\" Title: \fBmysql-test-run.pl\fR
2598 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2599 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2600-.\" Date: 07/04/2014
2601+.\" Date: 09/05/2014
2602 .\" Manual: MySQL Database System
2603 .\" Source: MySQL
2604 .\" Language: English
2605 .\"
2606-.TH "\FBMYSQL\-TEST\-RUN\" "1" "07/04/2014" "MySQL" "MySQL Database System"
2607+.TH "\FBMYSQL\-TEST\-RUN\" "1" "09/05/2014" "MySQL" "MySQL Database System"
2608 .\" -----------------------------------------------------------------
2609 .\" * Define some portability stuff
2610 .\" -----------------------------------------------------------------
2611@@ -1797,7 +1797,7 @@
2612 .\" skip-ndb option: mysql-test-run.pl
2613 \fB\-\-skip\-ndb\fR
2614 .sp
2615-Do not start NDB Cluster; skip Cluster test cases\&. From MySQL 5\&.1\&.52, this is the default and so this option does not do anything but is kept for backwards compatibility\&.
2616+Do not start NDB Cluster; skip Cluster test cases\&. From MySQL 5\&.1\&.52, this is the default and so this option does not do anything but is kept for backward compatibility\&.
2617 .RE
2618 .sp
2619 .RS 4
2620
2621=== modified file 'man/mysql.1'
2622--- man/mysql.1 2014-08-22 09:58:37 +0000
2623+++ man/mysql.1 2014-09-24 09:49:11 +0000
2624@@ -2,12 +2,12 @@
2625 .\" Title: \fBmysql\fR
2626 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2627 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2628-.\" Date: 07/18/2014
2629+.\" Date: 09/06/2014
2630 .\" Manual: MySQL Database System
2631 .\" Source: MySQL 5.5
2632 .\" Language: English
2633 .\"
2634-.TH "\FBMYSQL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2635+.TH "\FBMYSQL\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2636 .\" -----------------------------------------------------------------
2637 .\" * Define some portability stuff
2638 .\" -----------------------------------------------------------------
2639@@ -238,7 +238,7 @@
2640 .\" bind-address option: mysql
2641 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
2642 .sp
2643-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
2644+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
2645 .sp
2646 This option is supported only in the version of the
2647 \fBmysql\fR
2648@@ -427,7 +427,7 @@
2649 .sp
2650 A common issue that can occur when the operating system uses
2651 utf8
2652-or another multi\-byte character set is that output from the
2653+or another multibyte character set is that output from the
2654 \fBmysql\fR
2655 client is formatted incorrectly, due to the fact that the MySQL client uses the
2656 latin1
2657@@ -1247,6 +1247,26 @@
2658 .sp -1
2659 .IP \(bu 2.3
2660 .\}
2661+.\" mysql: shared-memory-base-name option
2662+.\" shared-memory-base-name option: mysql
2663+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
2664+.sp
2665+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
2666+MYSQL\&. The shared\-memory name is case sensitive\&.
2667+.sp
2668+The server must be started with the
2669+\fB\-\-shared\-memory\fR
2670+option to enable shared\-memory connections\&.
2671+.RE
2672+.sp
2673+.RS 4
2674+.ie n \{\
2675+\h'-04'\(bu\h'+03'\c
2676+.\}
2677+.el \{\
2678+.sp -1
2679+.IP \(bu 2.3
2680+.\}
2681 .\" mysql: show-warnings option
2682 .\" show-warnings option: mysql
2683 \fB\-\-show\-warnings\fR
2684
2685=== modified file 'man/mysql.server.1'
2686--- man/mysql.server.1 2014-08-22 09:58:37 +0000
2687+++ man/mysql.server.1 2014-09-24 09:49:11 +0000
2688@@ -2,12 +2,12 @@
2689 .\" Title: \fBmysql.server\fR
2690 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2691 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2692-.\" Date: 07/18/2014
2693+.\" Date: 09/06/2014
2694 .\" Manual: MySQL Database System
2695 .\" Source: MySQL 5.5
2696 .\" Language: English
2697 .\"
2698-.TH "\FBMYSQL\&.SERVER\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2699+.TH "\FBMYSQL\&.SERVER\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2700 .\" -----------------------------------------------------------------
2701 .\" * Define some portability stuff
2702 .\" -----------------------------------------------------------------
2703@@ -128,7 +128,7 @@
2704 .\}
2705 .\" mysql.server: service-startup-timeout option
2706 .\" service-startup-timeout option: mysql.server
2707-\fB\-\-service\-startup\-timeout=\fR\fB\fIfile_name\fR\fR
2708+\fB\-\-service\-startup\-timeout=\fR\fB\fIseconds\fR\fR
2709 .sp
2710 How long in seconds to wait for confirmation of server startup\&. If the server does not start within this time,
2711 \fBmysql\&.server\fR
2712
2713=== modified file 'man/mysql_client_test.1'
2714--- man/mysql_client_test.1 2014-08-22 09:58:37 +0000
2715+++ man/mysql_client_test.1 2014-09-24 09:49:11 +0000
2716@@ -2,12 +2,12 @@
2717 .\" Title: \fBmysql_client_test\fR
2718 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2719 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2720-.\" Date: 07/04/2014
2721+.\" Date: 09/05/2014
2722 .\" Manual: MySQL Database System
2723 .\" Source: MySQL
2724 .\" Language: English
2725 .\"
2726-.TH "\FBMYSQL_CLIENT_TEST" "1" "07/04/2014" "MySQL" "MySQL Database System"
2727+.TH "\FBMYSQL_CLIENT_TEST" "1" "09/05/2014" "MySQL" "MySQL Database System"
2728 .\" -----------------------------------------------------------------
2729 .\" * Define some portability stuff
2730 .\" -----------------------------------------------------------------
2731
2732=== modified file 'man/mysql_config.1'
2733--- man/mysql_config.1 2014-08-22 09:58:37 +0000
2734+++ man/mysql_config.1 2014-09-24 09:49:11 +0000
2735@@ -2,12 +2,12 @@
2736 .\" Title: \fBmysql_config\fR
2737 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2738 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2739-.\" Date: 07/18/2014
2740+.\" Date: 09/06/2014
2741 .\" Manual: MySQL Database System
2742 .\" Source: MySQL 5.5
2743 .\" Language: English
2744 .\"
2745-.TH "\FBMYSQL_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2746+.TH "\FBMYSQL_CONFIG\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2747 .\" -----------------------------------------------------------------
2748 .\" * Define some portability stuff
2749 .\" -----------------------------------------------------------------
2750
2751=== modified file 'man/mysql_convert_table_format.1'
2752--- man/mysql_convert_table_format.1 2014-08-22 09:58:37 +0000
2753+++ man/mysql_convert_table_format.1 2014-09-24 09:49:11 +0000
2754@@ -2,12 +2,12 @@
2755 .\" Title: \fBmysql_convert_table_format\fR
2756 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2757 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2758-.\" Date: 07/18/2014
2759+.\" Date: 09/06/2014
2760 .\" Manual: MySQL Database System
2761 .\" Source: MySQL 5.5
2762 .\" Language: English
2763 .\"
2764-.TH "\FBMYSQL_CONVERT_TAB" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2765+.TH "\FBMYSQL_CONVERT_TAB" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2766 .\" -----------------------------------------------------------------
2767 .\" * Define some portability stuff
2768 .\" -----------------------------------------------------------------
2769
2770=== modified file 'man/mysql_find_rows.1'
2771--- man/mysql_find_rows.1 2014-08-22 09:58:37 +0000
2772+++ man/mysql_find_rows.1 2014-09-24 09:49:11 +0000
2773@@ -2,12 +2,12 @@
2774 .\" Title: \fBmysql_find_rows\fR
2775 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2776 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2777-.\" Date: 07/18/2014
2778+.\" Date: 09/06/2014
2779 .\" Manual: MySQL Database System
2780 .\" Source: MySQL 5.5
2781 .\" Language: English
2782 .\"
2783-.TH "\FBMYSQL_FIND_ROWS\F" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2784+.TH "\FBMYSQL_FIND_ROWS\F" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2785 .\" -----------------------------------------------------------------
2786 .\" * Define some portability stuff
2787 .\" -----------------------------------------------------------------
2788
2789=== modified file 'man/mysql_fix_extensions.1'
2790--- man/mysql_fix_extensions.1 2014-08-22 09:58:37 +0000
2791+++ man/mysql_fix_extensions.1 2014-09-24 09:49:11 +0000
2792@@ -2,12 +2,12 @@
2793 .\" Title: \fBmysql_fix_extensions\fR
2794 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2795 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2796-.\" Date: 07/18/2014
2797+.\" Date: 09/06/2014
2798 .\" Manual: MySQL Database System
2799 .\" Source: MySQL 5.5
2800 .\" Language: English
2801 .\"
2802-.TH "\FBMYSQL_FIX_EXTENSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2803+.TH "\FBMYSQL_FIX_EXTENSI" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2804 .\" -----------------------------------------------------------------
2805 .\" * Define some portability stuff
2806 .\" -----------------------------------------------------------------
2807
2808=== modified file 'man/mysql_install_db.1'
2809--- man/mysql_install_db.1 2014-08-22 09:58:37 +0000
2810+++ man/mysql_install_db.1 2014-09-24 09:49:11 +0000
2811@@ -2,12 +2,12 @@
2812 .\" Title: \fBmysql_install_db\fR
2813 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2814 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2815-.\" Date: 07/18/2014
2816+.\" Date: 09/06/2014
2817 .\" Manual: MySQL Database System
2818 .\" Source: MySQL 5.5
2819 .\" Language: English
2820 .\"
2821-.TH "\FBMYSQL_INSTALL_DB\" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2822+.TH "\FBMYSQL_INSTALL_DB\" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2823 .\" -----------------------------------------------------------------
2824 .\" * Define some portability stuff
2825 .\" -----------------------------------------------------------------
2826
2827=== modified file 'man/mysql_plugin.1'
2828--- man/mysql_plugin.1 2014-08-22 09:58:37 +0000
2829+++ man/mysql_plugin.1 2014-09-24 09:49:11 +0000
2830@@ -2,12 +2,12 @@
2831 .\" Title: \fBmysql_plugin\fR
2832 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2833 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2834-.\" Date: 07/18/2014
2835+.\" Date: 09/06/2014
2836 .\" Manual: MySQL Database System
2837 .\" Source: MySQL 5.5
2838 .\" Language: English
2839 .\"
2840-.TH "\FBMYSQL_PLUGIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2841+.TH "\FBMYSQL_PLUGIN\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2842 .\" -----------------------------------------------------------------
2843 .\" * Define some portability stuff
2844 .\" -----------------------------------------------------------------
2845
2846=== modified file 'man/mysql_secure_installation.1'
2847--- man/mysql_secure_installation.1 2014-08-22 09:58:37 +0000
2848+++ man/mysql_secure_installation.1 2014-09-24 09:49:11 +0000
2849@@ -2,12 +2,12 @@
2850 .\" Title: \fBmysql_secure_installation\fR
2851 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2852 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2853-.\" Date: 07/18/2014
2854+.\" Date: 09/06/2014
2855 .\" Manual: MySQL Database System
2856 .\" Source: MySQL 5.5
2857 .\" Language: English
2858 .\"
2859-.TH "\FBMYSQL_SECURE_INST" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2860+.TH "\FBMYSQL_SECURE_INST" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2861 .\" -----------------------------------------------------------------
2862 .\" * Define some portability stuff
2863 .\" -----------------------------------------------------------------
2864
2865=== modified file 'man/mysql_setpermission.1'
2866--- man/mysql_setpermission.1 2014-08-22 09:58:37 +0000
2867+++ man/mysql_setpermission.1 2014-09-24 09:49:11 +0000
2868@@ -2,12 +2,12 @@
2869 .\" Title: \fBmysql_setpermission\fR
2870 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2871 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2872-.\" Date: 07/18/2014
2873+.\" Date: 09/06/2014
2874 .\" Manual: MySQL Database System
2875 .\" Source: MySQL 5.5
2876 .\" Language: English
2877 .\"
2878-.TH "\FBMYSQL_SETPERMISSI" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2879+.TH "\FBMYSQL_SETPERMISSI" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2880 .\" -----------------------------------------------------------------
2881 .\" * Define some portability stuff
2882 .\" -----------------------------------------------------------------
2883
2884=== modified file 'man/mysql_tzinfo_to_sql.1'
2885--- man/mysql_tzinfo_to_sql.1 2014-08-22 09:58:37 +0000
2886+++ man/mysql_tzinfo_to_sql.1 2014-09-24 09:49:11 +0000
2887@@ -2,12 +2,12 @@
2888 .\" Title: \fBmysql_tzinfo_to_sql\fR
2889 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2890 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2891-.\" Date: 07/18/2014
2892+.\" Date: 09/06/2014
2893 .\" Manual: MySQL Database System
2894 .\" Source: MySQL 5.5
2895 .\" Language: English
2896 .\"
2897-.TH "\FBMYSQL_TZINFO_TO_S" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2898+.TH "\FBMYSQL_TZINFO_TO_S" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2899 .\" -----------------------------------------------------------------
2900 .\" * Define some portability stuff
2901 .\" -----------------------------------------------------------------
2902
2903=== modified file 'man/mysql_upgrade.1'
2904--- man/mysql_upgrade.1 2014-08-22 09:58:37 +0000
2905+++ man/mysql_upgrade.1 2014-09-24 09:49:11 +0000
2906@@ -2,12 +2,12 @@
2907 .\" Title: \fBmysql_upgrade\fR
2908 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2909 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2910-.\" Date: 07/18/2014
2911+.\" Date: 09/06/2014
2912 .\" Manual: MySQL Database System
2913 .\" Source: MySQL 5.5
2914 .\" Language: English
2915 .\"
2916-.TH "\FBMYSQL_UPGRADE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
2917+.TH "\FBMYSQL_UPGRADE\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
2918 .\" -----------------------------------------------------------------
2919 .\" * Define some portability stuff
2920 .\" -----------------------------------------------------------------
2921@@ -42,14 +42,21 @@
2922 \fBmysql_upgrade\fR
2923 also upgrades the system tables so that you can take advantage of new privileges or capabilities that might have been added\&.
2924 .PP
2925-\fBmysql_upgrade\fR
2926-should be executed each time you upgrade MySQL\&.
2927-.PP
2928 If
2929 \fBmysql_upgrade\fR
2930 finds that a table has a possible incompatibility, it performs a table check and, if problems are found, attempts a table repair\&. If the table cannot be repaired, see
2931 Section\ \&2.11.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
2932 for manual table repair strategies\&.
2933+.PP
2934+You should execute
2935+\fBmysql_upgrade\fR
2936+each time you upgrade MySQL\&.
2937+.PP
2938+If you install MySQL from RPM packages on Linux, you must install the server and client RPMs\&.
2939+\fBmysql_upgrade\fR
2940+is included in the server RPM but requires the client RPM because the latter includes
2941+\fBmysqlcheck\fR\&. (See
2942+Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq\&.)
2943 .if n \{\
2944 .sp
2945 .\}
2946@@ -93,7 +100,7 @@
2947 .RE
2948 .PP
2949 To use
2950-\fBmysql_upgrade\fR, make sure that the server is running, and then invoke it like this:
2951+\fBmysql_upgrade\fR, make sure that the server is running\&. Then invoke it like this:
2952 .sp
2953 .if n \{\
2954 .RS 4
2955@@ -108,6 +115,26 @@
2956 After running
2957 \fBmysql_upgrade\fR, stop the server and restart it so that any changes made to the system tables take effect\&.
2958 .PP
2959+If you have multiple MySQL server instances running, invoke
2960+\fBmysql_upgrade\fR
2961+with connection parameters appropriate for connecting to the desired server\&. For example, with servers running on the local host on parts 3306 through 3308, upgrade each of them by connecting to the appropriate port:
2962+.sp
2963+.if n \{\
2964+.RS 4
2965+.\}
2966+.nf
2967+shell> \fBmysql_upgrade \-\-protocol=tcp \-P 3306 [\fR\fB\fIother_options\fR\fR\fB]\fR
2968+shell> \fBmysql_upgrade \-\-protocol=tcp \-P 3307 [\fR\fB\fIother_options\fR\fR\fB]\fR
2969+shell> \fBmysql_upgrade \-\-protocol=tcp \-P 3308 [\fR\fB\fIother_options\fR\fR\fB]\fR
2970+.fi
2971+.if n \{\
2972+.RE
2973+.\}
2974+.PP
2975+For local host connections on Unix, the
2976+\fB\-\-protocol=tcp\fR
2977+option forces a connection using TCP/IP rather than the Unix socket file\&.
2978+.PP
2979 \fBmysql_upgrade\fR
2980 executes the following commands to check and repair tables and to upgrade the system tables:
2981 .sp
2982@@ -213,12 +240,6 @@
2983 \fB\-\-force\fR
2984 option\&.
2985 .PP
2986-If you install MySQL from RPM packages on Linux, you must install the server and client RPMs\&.
2987-\fBmysql_upgrade\fR
2988-is included in the server RPM but requires the client RPM because the latter includes
2989-\fBmysqlcheck\fR\&. (See
2990-Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq\&.)
2991-.PP
2992 \fBmysql_upgrade\fR
2993 does not upgrade the contents of the help tables\&. For upgrade instructions, see
2994 Section\ \&5.1.10, \(lqServer-Side Help\(rq\&.
2995@@ -228,10 +249,8 @@
2996 [mysql_upgrade]
2997 and
2998 [client]
2999-groups of an option file\&. Other options are passed to
3000-\fBmysqlcheck\fR\&. For example, it might be necessary to specify the
3001-\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR
3002-option\&. For information about option files, see
3003+groups of an option file\&. Unrecognized options are passed to
3004+\fBmysqlcheck\fR\&. For information about option files, see
3005 Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
3006 .sp
3007 .RS 4
3008@@ -259,7 +278,7 @@
3009 .\}
3010 .\" mysql_upgrade: basedir option
3011 .\" basedir option: mysql_upgrade
3012-\fB\-\-basedir=\fR\fB\fIpath\fR\fR
3013+\fB\-\-basedir=\fR\fB\fIdir_name\fR\fR
3014 .sp
3015 The path to the MySQL installation directory\&. This option is accepted for backward compatibility but ignored\&. It is removed in MySQL 5\&.7\&.
3016 .RE
3017@@ -272,9 +291,40 @@
3018 .sp -1
3019 .IP \(bu 2.3
3020 .\}
3021+.\" mysql_upgrade: character-sets-dir option
3022+.\" character-sets-dir option: mysql_upgrade
3023+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
3024+.sp
3025+The directory where character sets are installed\&. See
3026+Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
3027+.RE
3028+.sp
3029+.RS 4
3030+.ie n \{\
3031+\h'-04'\(bu\h'+03'\c
3032+.\}
3033+.el \{\
3034+.sp -1
3035+.IP \(bu 2.3
3036+.\}
3037+.\" mysql_upgrade: compress option
3038+.\" compress option: mysql_upgrade
3039+\fB\-\-compress\fR
3040+.sp
3041+Compress all information sent between the client and the server if both support compression\&.
3042+.RE
3043+.sp
3044+.RS 4
3045+.ie n \{\
3046+\h'-04'\(bu\h'+03'\c
3047+.\}
3048+.el \{\
3049+.sp -1
3050+.IP \(bu 2.3
3051+.\}
3052 .\" mysql_upgrade: datadir option
3053 .\" datadir option: mysql_upgrade
3054-\fB\-\-datadir=\fR\fB\fIpath\fR\fR
3055+\fB\-\-datadir=\fR\fB\fIdir_name\fR\fR
3056 .sp
3057 The path to the data directory\&. This option is accepted for backward compatibility but ignored\&. It is removed in MySQL 5\&.7\&.
3058 .RE
3059@@ -289,13 +339,13 @@
3060 .\}
3061 .\" mysql_upgrade: debug option
3062 .\" debug option: mysql_upgrade
3063-\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
3064-\fB\-# \fR\fB\fIdebug_options\fR\fR
3065+\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
3066+\fB\-# [\fR\fB\fIdebug_options\fR\fR\fB]\fR
3067 .sp
3068 Write a debugging log\&. A typical
3069 \fIdebug_options\fR
3070 string is
3071-d:t:O,\fIfile_name\fR\&. The default is
3072+d:t:o,\fIfile_name\fR\&. The default is
3073 d:t:O,/tmp/mysql_upgrade\&.trace\&.
3074 .RE
3075 .sp
3076@@ -356,6 +406,24 @@
3077 .sp -1
3078 .IP \(bu 2.3
3079 .\}
3080+.\" mysql_upgrade: default-character-set option
3081+.\" default-character-set option: mysql_upgrade
3082+\fB\-\-default\-character\-set=\fR\fB\fIcharset_name\fR\fR
3083+.sp
3084+Use
3085+\fIcharset_name\fR
3086+as the default character set\&. See
3087+Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
3088+.RE
3089+.sp
3090+.RS 4
3091+.ie n \{\
3092+\h'-04'\(bu\h'+03'\c
3093+.\}
3094+.el \{\
3095+.sp -1
3096+.IP \(bu 2.3
3097+.\}
3098 .\" mysql_upgrade: defaults-extra-file option
3099 .\" defaults-extra-file option: mysql_upgrade
3100 \fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
3101@@ -426,9 +494,7 @@
3102 .sp
3103 Ignore the
3104 mysql_upgrade_info
3105-file and force execution of
3106-\fBmysqlcheck\fR
3107-even if
3108+file and force execution even if
3109 \fBmysql_upgrade\fR
3110 has already been executed for the current version of MySQL\&.
3111 .RE
3112@@ -441,6 +507,22 @@
3113 .sp -1
3114 .IP \(bu 2.3
3115 .\}
3116+.\" mysql_upgrade: host option
3117+.\" host option: mysql_upgrade
3118+\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
3119+\fB\-h \fR\fB\fIhost_name\fR\fR
3120+.sp
3121+Connect to the MySQL server on the given host\&.
3122+.RE
3123+.sp
3124+.RS 4
3125+.ie n \{\
3126+\h'-04'\(bu\h'+03'\c
3127+.\}
3128+.el \{\
3129+.sp -1
3130+.IP \(bu 2.3
3131+.\}
3132 .\" mysql_upgrade: no-defaults option
3133 .\" no-defaults option: mysql_upgrade
3134 \fB\-\-no\-defaults\fR
3135@@ -458,6 +540,51 @@
3136 .sp -1
3137 .IP \(bu 2.3
3138 .\}
3139+.\" mysql_upgrade: password option
3140+.\" password option: mysql_upgrade
3141+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
3142+\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
3143+.sp
3144+The password to use when connecting to the server\&. If you use the short option form (\fB\-p\fR), you
3145+\fIcannot\fR
3146+have a space between the option and the password\&. If you omit the
3147+\fIpassword\fR
3148+value following the
3149+\fB\-\-password\fR
3150+or
3151+\fB\-p\fR
3152+option on the command line,
3153+\fBmysql_upgrade\fR
3154+prompts for one\&.
3155+.sp
3156+Specifying a password on the command line should be considered insecure\&. See
3157+Section\ \&6.1.2.1, \(lqEnd-User Guidelines for Password Security\(rq\&. You can use an option file to avoid giving the password on the command line\&.
3158+.RE
3159+.sp
3160+.RS 4
3161+.ie n \{\
3162+\h'-04'\(bu\h'+03'\c
3163+.\}
3164+.el \{\
3165+.sp -1
3166+.IP \(bu 2.3
3167+.\}
3168+.\" mysql_upgrade: pipe option
3169+.\" pipe option: mysql_upgrade
3170+\fB\-\-pipe\fR,
3171+\fB\-W\fR
3172+.sp
3173+On Windows, connect to the server using a named pipe\&. This option applies only if the server supports named\-pipe connections\&.
3174+.RE
3175+.sp
3176+.RS 4
3177+.ie n \{\
3178+\h'-04'\(bu\h'+03'\c
3179+.\}
3180+.el \{\
3181+.sp -1
3182+.IP \(bu 2.3
3183+.\}
3184 .\" mysql_upgrade: plugin-dir option
3185 .\" plugin-dir option: mysql_upgrade
3186 \fB\-\-plugin\-dir=\fR\fB\fIpath\fR\fR
3187@@ -480,6 +607,22 @@
3188 .sp -1
3189 .IP \(bu 2.3
3190 .\}
3191+.\" mysql_upgrade: port option
3192+.\" port option: mysql_upgrade
3193+\fB\-\-port=\fR\fB\fIport_num\fR\fR,
3194+\fB\-P \fR\fB\fIport_num\fR\fR
3195+.sp
3196+The TCP/IP port number to use for the connection\&.
3197+.RE
3198+.sp
3199+.RS 4
3200+.ie n \{\
3201+\h'-04'\(bu\h'+03'\c
3202+.\}
3203+.el \{\
3204+.sp -1
3205+.IP \(bu 2.3
3206+.\}
3207 .\" mysql_upgrade: print-defaults option
3208 .\" print-defaults option: mysql_upgrade
3209 \fB\-\-print\-defaults\fR
3210@@ -495,9 +638,80 @@
3211 .sp -1
3212 .IP \(bu 2.3
3213 .\}
3214+.\" mysql_upgrade: protocol option
3215+.\" protocol option: mysql_upgrade
3216+\fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
3217+.sp
3218+The connection protocol to use for connecting to the server\&. It is useful when the other connection parameters normally would cause a protocol to be used other than the one you want\&. For details on the permissible values, see
3219+Section\ \&4.2.2, \(lqConnecting to the MySQL Server\(rq\&.
3220+.RE
3221+.sp
3222+.RS 4
3223+.ie n \{\
3224+\h'-04'\(bu\h'+03'\c
3225+.\}
3226+.el \{\
3227+.sp -1
3228+.IP \(bu 2.3
3229+.\}
3230+.\" mysql_upgrade: shared-memory-base-name option
3231+.\" shared-memory-base-name option: mysql_upgrade
3232+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
3233+.sp
3234+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
3235+MYSQL\&. The shared\-memory name is case sensitive\&.
3236+.sp
3237+The server must be started with the
3238+\fB\-\-shared\-memory\fR
3239+option to enable shared\-memory connections\&.
3240+.RE
3241+.sp
3242+.RS 4
3243+.ie n \{\
3244+\h'-04'\(bu\h'+03'\c
3245+.\}
3246+.el \{\
3247+.sp -1
3248+.IP \(bu 2.3
3249+.\}
3250+.\" mysql_upgrade: socket option
3251+.\" socket option: mysql_upgrade
3252+\fB\-\-socket=\fR\fB\fIpath\fR\fR,
3253+\fB\-S \fR\fB\fIpath\fR\fR
3254+.sp
3255+For connections to
3256+localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
3257+.RE
3258+.sp
3259+.RS 4
3260+.ie n \{\
3261+\h'-04'\(bu\h'+03'\c
3262+.\}
3263+.el \{\
3264+.sp -1
3265+.IP \(bu 2.3
3266+.\}
3267+.\" mysql_upgrade: SSL options
3268+.\" SSL options: mysql_upgrade
3269+\fB\-\-ssl*\fR
3270+.sp
3271+Options that begin with
3272+\fB\-\-ssl\fR
3273+specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
3274+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
3275+.RE
3276+.sp
3277+.RS 4
3278+.ie n \{\
3279+\h'-04'\(bu\h'+03'\c
3280+.\}
3281+.el \{\
3282+.sp -1
3283+.IP \(bu 2.3
3284+.\}
3285 .\" mysql_upgrade: tmpdir option
3286 .\" tmpdir option: mysql_upgrade
3287-\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,
3288+\fB\-\-tmpdir=\fR\fB\fIdir_name\fR\fR,
3289 \fB\-t \fR\fB\fIpath\fR\fR
3290 .sp
3291 The path name of the directory to use for creating temporary files\&.
3292
3293=== modified file 'man/mysql_waitpid.1'
3294--- man/mysql_waitpid.1 2014-08-22 09:58:37 +0000
3295+++ man/mysql_waitpid.1 2014-09-24 09:49:11 +0000
3296@@ -2,12 +2,12 @@
3297 .\" Title: \fBmysql_waitpid\fR
3298 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3299 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3300-.\" Date: 07/18/2014
3301+.\" Date: 09/06/2014
3302 .\" Manual: MySQL Database System
3303 .\" Source: MySQL 5.5
3304 .\" Language: English
3305 .\"
3306-.TH "\FBMYSQL_WAITPID\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3307+.TH "\FBMYSQL_WAITPID\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3308 .\" -----------------------------------------------------------------
3309 .\" * Define some portability stuff
3310 .\" -----------------------------------------------------------------
3311
3312=== modified file 'man/mysql_zap.1'
3313--- man/mysql_zap.1 2014-08-22 09:58:37 +0000
3314+++ man/mysql_zap.1 2014-09-24 09:49:11 +0000
3315@@ -2,12 +2,12 @@
3316 .\" Title: \fBmysql_zap\fR
3317 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3318 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3319-.\" Date: 07/18/2014
3320+.\" Date: 09/06/2014
3321 .\" Manual: MySQL Database System
3322 .\" Source: MySQL 5.5
3323 .\" Language: English
3324 .\"
3325-.TH "\FBMYSQL_ZAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3326+.TH "\FBMYSQL_ZAP\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3327 .\" -----------------------------------------------------------------
3328 .\" * Define some portability stuff
3329 .\" -----------------------------------------------------------------
3330
3331=== modified file 'man/mysqlaccess.1'
3332--- man/mysqlaccess.1 2014-08-22 09:58:37 +0000
3333+++ man/mysqlaccess.1 2014-09-24 09:49:11 +0000
3334@@ -2,12 +2,12 @@
3335 .\" Title: \fBmysqlaccess\fR
3336 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3337 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3338-.\" Date: 07/18/2014
3339+.\" Date: 09/06/2014
3340 .\" Manual: MySQL Database System
3341 .\" Source: MySQL 5.5
3342 .\" Language: English
3343 .\"
3344-.TH "\FBMYSQLACCESS\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3345+.TH "\FBMYSQLACCESS\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3346 .\" -----------------------------------------------------------------
3347 .\" * Define some portability stuff
3348 .\" -----------------------------------------------------------------
3349
3350=== modified file 'man/mysqladmin.1'
3351--- man/mysqladmin.1 2014-08-22 09:58:37 +0000
3352+++ man/mysqladmin.1 2014-09-24 09:49:11 +0000
3353@@ -2,12 +2,12 @@
3354 .\" Title: \fBmysqladmin\fR
3355 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3356 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3357-.\" Date: 07/18/2014
3358+.\" Date: 09/06/2014
3359 .\" Manual: MySQL Database System
3360 .\" Source: MySQL 5.5
3361 .\" Language: English
3362 .\"
3363-.TH "\FBMYSQLADMIN\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3364+.TH "\FBMYSQLADMIN\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3365 .\" -----------------------------------------------------------------
3366 .\" * Define some portability stuff
3367 .\" -----------------------------------------------------------------
3368@@ -640,7 +640,7 @@
3369 .\" bind-address option: mysqladmin
3370 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
3371 .sp
3372-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
3373+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
3374 .sp
3375 This option is supported only in the version of
3376 \fBmysqladmin\fR
3377@@ -1074,6 +1074,26 @@
3378 .sp -1
3379 .IP \(bu 2.3
3380 .\}
3381+.\" mysqladmin: shared-memory-base-name option
3382+.\" shared-memory-base-name option: mysqladmin
3383+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
3384+.sp
3385+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
3386+MYSQL\&. The shared\-memory name is case sensitive\&.
3387+.sp
3388+The server must be started with the
3389+\fB\-\-shared\-memory\fR
3390+option to enable shared\-memory connections\&.
3391+.RE
3392+.sp
3393+.RS 4
3394+.ie n \{\
3395+\h'-04'\(bu\h'+03'\c
3396+.\}
3397+.el \{\
3398+.sp -1
3399+.IP \(bu 2.3
3400+.\}
3401 .\" mysqladmin: silent option
3402 .\" silent option: mysqladmin
3403 \fB\-\-silent\fR,
3404
3405=== modified file 'man/mysqlbinlog.1'
3406--- man/mysqlbinlog.1 2014-08-22 09:58:37 +0000
3407+++ man/mysqlbinlog.1 2014-09-24 09:49:11 +0000
3408@@ -2,12 +2,12 @@
3409 .\" Title: \fBmysqlbinlog\fR
3410 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3411 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3412-.\" Date: 07/18/2014
3413+.\" Date: 09/06/2014
3414 .\" Manual: MySQL Database System
3415 .\" Source: MySQL 5.5
3416 .\" Language: English
3417 .\"
3418-.TH "\FBMYSQLBINLOG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3419+.TH "\FBMYSQLBINLOG\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3420 .\" -----------------------------------------------------------------
3421 .\" * Define some portability stuff
3422 .\" -----------------------------------------------------------------
3423@@ -120,24 +120,7 @@
3424 .ps -1
3425 .br
3426 .PP
3427-When using event groups, the file offsets of all events are grouped together and the comments of all events are grouped together\&. For example:
3428-.sp
3429-.if n \{\
3430-.RS 4
3431-.\}
3432-.nf
3433-# at 587
3434-# at 630
3435-# at 5662
3436-#140627 13:16:52 server id 1 end_log_pos 630 Table_map: `test`\&.`t1` mapped to number 41
3437-#140627 13:16:52 server id 1 end_log_pos 5662 Write_rows: table id 41
3438-#140627 13:16:52 server id 1 end_log_pos 10694 Write_rows: table id 41 flags: STMT_END_F
3439-.fi
3440-.if n \{\
3441-.RE
3442-.\}
3443-.PP
3444-The three file offsets do not represent blank events\&.
3445+When using event groups, the file offsets of events may be grouped together and the comments of events may be grouped together\&. Do not mistake these grouped events for blank file offsets\&.
3446 .sp .5v
3447 .RE
3448 .PP
3449@@ -332,7 +315,7 @@
3450 .\" bind-address option: mysqlbinlog
3451 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
3452 .sp
3453-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
3454+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
3455 .sp
3456 This option is supported beginning with MySQL 5\&.5\&.8\&.
3457 .RE
3458@@ -1045,6 +1028,26 @@
3459 .sp -1
3460 .IP \(bu 2.3
3461 .\}
3462+.\" mysqlbinlog: shared-memory-base-name option
3463+.\" shared-memory-base-name option: mysqlbinlog
3464+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
3465+.sp
3466+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
3467+MYSQL\&. The shared\-memory name is case sensitive\&.
3468+.sp
3469+The server must be started with the
3470+\fB\-\-shared\-memory\fR
3471+option to enable shared\-memory connections\&.
3472+.RE
3473+.sp
3474+.RS 4
3475+.ie n \{\
3476+\h'-04'\(bu\h'+03'\c
3477+.\}
3478+.el \{\
3479+.sp -1
3480+.IP \(bu 2.3
3481+.\}
3482 .\" mysqlbinlog: short-form option
3483 .\" short-form option: mysqlbinlog
3484 \fB\-\-short\-form\fR,
3485@@ -2180,7 +2183,7 @@
3486 .sp -1
3487 .IP \(bu 2.3
3488 .\}
3489-For multi\-byte character sets, the maximum number of bytes per character is not present in the binary log, so the length for string types is displayed in bytes rather than in characters\&. For example,
3490+For multibyte character sets, the maximum number of bytes per character is not present in the binary log, so the length for string types is displayed in bytes rather than in characters\&. For example,
3491 STRING(4)
3492 will be used as the data type for values from either of these column types:
3493 .sp
3494
3495=== modified file 'man/mysqlbug.1'
3496--- man/mysqlbug.1 2014-08-22 09:58:37 +0000
3497+++ man/mysqlbug.1 2014-09-24 09:49:11 +0000
3498@@ -2,12 +2,12 @@
3499 .\" Title: \fBmysqlbug\fR
3500 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3501 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3502-.\" Date: 07/18/2014
3503+.\" Date: 09/06/2014
3504 .\" Manual: MySQL Database System
3505 .\" Source: MySQL 5.5
3506 .\" Language: English
3507 .\"
3508-.TH "\FBMYSQLBUG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3509+.TH "\FBMYSQLBUG\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3510 .\" -----------------------------------------------------------------
3511 .\" * Define some portability stuff
3512 .\" -----------------------------------------------------------------
3513
3514=== modified file 'man/mysqlcheck.1'
3515--- man/mysqlcheck.1 2014-08-22 09:58:37 +0000
3516+++ man/mysqlcheck.1 2014-09-24 09:49:11 +0000
3517@@ -2,12 +2,12 @@
3518 .\" Title: \fBmysqlcheck\fR
3519 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3520 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3521-.\" Date: 07/18/2014
3522+.\" Date: 09/06/2014
3523 .\" Manual: MySQL Database System
3524 .\" Source: MySQL 5.5
3525 .\" Language: English
3526 .\"
3527-.TH "\FBMYSQLCHECK\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3528+.TH "\FBMYSQLCHECK\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3529 .\" -----------------------------------------------------------------
3530 .\" * Define some portability stuff
3531 .\" -----------------------------------------------------------------
3532@@ -306,7 +306,7 @@
3533 .\" bind-address option: mysqlcheck
3534 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
3535 .sp
3536-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
3537+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
3538 .sp
3539 This option is supported only in the version of
3540 \fBmysqlcheck\fR
3541@@ -421,8 +421,9 @@
3542 INFORMATION_SCHEMA
3543 and
3544 performace_schema
3545-databases, which normally are not dumped even with
3546-\fB\-\-all\-databases\fR\&. option\&. (Also use the
3547+databases, which normally are not dumped even with the
3548+\fB\-\-all\-databases\fR
3549+option\&. (Also use the
3550 \fB\-\-skip\-lock\-tables\fR
3551 option\&.)
3552 .RE
3553@@ -880,6 +881,26 @@
3554 .sp -1
3555 .IP \(bu 2.3
3556 .\}
3557+.\" mysqlcheck: shared-memory-base-name option
3558+.\" shared-memory-base-name option: mysqlcheck
3559+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
3560+.sp
3561+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
3562+MYSQL\&. The shared\-memory name is case sensitive\&.
3563+.sp
3564+The server must be started with the
3565+\fB\-\-shared\-memory\fR
3566+option to enable shared\-memory connections\&.
3567+.RE
3568+.sp
3569+.RS 4
3570+.ie n \{\
3571+\h'-04'\(bu\h'+03'\c
3572+.\}
3573+.el \{\
3574+.sp -1
3575+.IP \(bu 2.3
3576+.\}
3577 .\" mysqlcheck: silent option
3578 .\" silent option: mysqlcheck
3579 \fB\-\-silent\fR,
3580
3581=== modified file 'man/mysqld.8'
3582--- man/mysqld.8 2014-08-22 09:58:37 +0000
3583+++ man/mysqld.8 2014-09-24 09:49:11 +0000
3584@@ -2,12 +2,12 @@
3585 .\" Title: \fBmysqld\fR
3586 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3587 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3588-.\" Date: 07/18/2014
3589+.\" Date: 09/06/2014
3590 .\" Manual: MySQL Database System
3591 .\" Source: MySQL 5.5
3592 .\" Language: English
3593 .\"
3594-.TH "\FBMYSQLD\FR" "8" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3595+.TH "\FBMYSQLD\FR" "8" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3596 .\" -----------------------------------------------------------------
3597 .\" * Define some portability stuff
3598 .\" -----------------------------------------------------------------
3599
3600=== modified file 'man/mysqld_multi.1'
3601--- man/mysqld_multi.1 2014-08-22 09:58:37 +0000
3602+++ man/mysqld_multi.1 2014-09-24 09:49:11 +0000
3603@@ -2,12 +2,12 @@
3604 .\" Title: \fBmysqld_multi\fR
3605 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3606 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3607-.\" Date: 07/18/2014
3608+.\" Date: 09/06/2014
3609 .\" Manual: MySQL Database System
3610 .\" Source: MySQL 5.5
3611 .\" Language: English
3612 .\"
3613-.TH "\FBMYSQLD_MULTI\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3614+.TH "\FBMYSQLD_MULTI\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3615 .\" -----------------------------------------------------------------
3616 .\" * Define some portability stuff
3617 .\" -----------------------------------------------------------------
3618
3619=== modified file 'man/mysqld_safe.1'
3620--- man/mysqld_safe.1 2014-08-22 09:58:37 +0000
3621+++ man/mysqld_safe.1 2014-09-24 09:49:11 +0000
3622@@ -2,12 +2,12 @@
3623 .\" Title: \fBmysqld_safe\fR
3624 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3625 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3626-.\" Date: 07/18/2014
3627+.\" Date: 09/06/2014
3628 .\" Manual: MySQL Database System
3629 .\" Source: MySQL 5.5
3630 .\" Language: English
3631 .\"
3632-.TH "\FBMYSQLD_SAFE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3633+.TH "\FBMYSQLD_SAFE\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3634 .\" -----------------------------------------------------------------
3635 .\" * Define some portability stuff
3636 .\" -----------------------------------------------------------------
3637@@ -472,11 +472,26 @@
3638 The number of files that
3639 \fBmysqld\fR
3640 should be able to open\&. The option value is passed to
3641-\fBulimit \-n\fR\&. Note that you need to start
3642+\fBulimit \-n\fR\&.
3643+.if n \{\
3644+.sp
3645+.\}
3646+.RS 4
3647+.it 1 an-trap
3648+.nr an-no-space-flag 1
3649+.nr an-break-flag 1
3650+.br
3651+.ps +1
3652+\fBNote\fR
3653+.ps -1
3654+.br
3655+You must start
3656 \fBmysqld_safe\fR
3657 as
3658 root
3659-for this to work properly!
3660+for this to function properly\&.
3661+.sp .5v
3662+.RE
3663 .RE
3664 .sp
3665 .RS 4
3666@@ -587,7 +602,7 @@
3667 syslog
3668 is used, the
3669 daemon\&.err
3670-syslog priority/facility is used for all log messages\&.
3671+syslog facility/severity is used for all log messages\&.
3672 .RE
3673 .sp
3674 .RS 4
3675@@ -607,11 +622,11 @@
3676 \fBmysqld_safe\fR
3677 and
3678 \fBmysqld\fR
3679-are written with a tag of
3680+are written with identifiers of
3681 mysqld_safe
3682 and
3683-mysqld, respectively\&. To specify a suffix for the tag, use
3684-\fB\-\-syslog\-tag=\fR\fB\fItag\fR\fR, which modifies the tags to be
3685+mysqld, respectively\&. To specify a suffix for the identifiers, use
3686+\fB\-\-syslog\-tag=\fR\fB\fItag\fR\fR, which modifies the identifiers to be
3687 mysqld_safe\-\fItag\fR
3688 and
3689 mysqld\-\fItag\fR\&.
3690@@ -754,7 +769,7 @@
3691 .PP
3692 If
3693 \fBmysqld_safe\fR
3694-fails, even when invoked from the MySQL installation directory, you can specify the
3695+fails, even when invoked from the MySQL installation directory, specify the
3696 \fB\-\-ledir\fR
3697 and
3698 \fB\-\-datadir\fR
3699
3700=== modified file 'man/mysqldump.1'
3701--- man/mysqldump.1 2014-08-22 09:58:37 +0000
3702+++ man/mysqldump.1 2014-09-24 09:49:11 +0000
3703@@ -2,12 +2,12 @@
3704 .\" Title: \fBmysqldump\fR
3705 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3706 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3707-.\" Date: 07/18/2014
3708+.\" Date: 09/06/2014
3709 .\" Manual: MySQL Database System
3710 .\" Source: MySQL 5.5
3711 .\" Language: English
3712 .\"
3713-.TH "\FBMYSQLDUMP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3714+.TH "\FBMYSQLDUMP\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3715 .\" -----------------------------------------------------------------
3716 .\" * Define some portability stuff
3717 .\" -----------------------------------------------------------------
3718@@ -549,7 +549,7 @@
3719 .\" bind-address option: mysqldump
3720 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
3721 .sp
3722-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
3723+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
3724 .sp
3725 This option is supported only in the version of
3726 \fBmysqldump\fR
3727@@ -2012,6 +2012,26 @@
3728 .sp -1
3729 .IP \(bu 2.3
3730 .\}
3731+.\" mysqldump: shared-memory-base-name option
3732+.\" shared-memory-base-name option: mysqldump
3733+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
3734+.sp
3735+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
3736+MYSQL\&. The shared\-memory name is case sensitive\&.
3737+.sp
3738+The server must be started with the
3739+\fB\-\-shared\-memory\fR
3740+option to enable shared\-memory connections\&.
3741+.RE
3742+.sp
3743+.RS 4
3744+.ie n \{\
3745+\h'-04'\(bu\h'+03'\c
3746+.\}
3747+.el \{\
3748+.sp -1
3749+.IP \(bu 2.3
3750+.\}
3751 .\" mysqldump: single-transaction option
3752 .\" single-transaction option: mysqldump
3753 \fB\-\-single\-transaction\fR
3754
3755=== modified file 'man/mysqldumpslow.1'
3756--- man/mysqldumpslow.1 2014-08-22 09:58:37 +0000
3757+++ man/mysqldumpslow.1 2014-09-24 09:49:11 +0000
3758@@ -2,12 +2,12 @@
3759 .\" Title: \fBmysqldumpslow\fR
3760 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3761 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3762-.\" Date: 07/18/2014
3763+.\" Date: 09/06/2014
3764 .\" Manual: MySQL Database System
3765 .\" Source: MySQL 5.5
3766 .\" Language: English
3767 .\"
3768-.TH "\FBMYSQLDUMPSLOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3769+.TH "\FBMYSQLDUMPSLOW\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3770 .\" -----------------------------------------------------------------
3771 .\" * Define some portability stuff
3772 .\" -----------------------------------------------------------------
3773
3774=== modified file 'man/mysqlhotcopy.1'
3775--- man/mysqlhotcopy.1 2014-08-22 09:58:37 +0000
3776+++ man/mysqlhotcopy.1 2014-09-24 09:49:11 +0000
3777@@ -2,12 +2,12 @@
3778 .\" Title: \fBmysqlhotcopy\fR
3779 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3780 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3781-.\" Date: 07/18/2014
3782+.\" Date: 09/06/2014
3783 .\" Manual: MySQL Database System
3784 .\" Source: MySQL 5.5
3785 .\" Language: English
3786 .\"
3787-.TH "\FBMYSQLHOTCOPY\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3788+.TH "\FBMYSQLHOTCOPY\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3789 .\" -----------------------------------------------------------------
3790 .\" * Define some portability stuff
3791 .\" -----------------------------------------------------------------
3792
3793=== modified file 'man/mysqlimport.1'
3794--- man/mysqlimport.1 2014-08-22 09:58:37 +0000
3795+++ man/mysqlimport.1 2014-09-24 09:49:11 +0000
3796@@ -2,12 +2,12 @@
3797 .\" Title: \fBmysqlimport\fR
3798 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3799 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3800-.\" Date: 07/18/2014
3801+.\" Date: 09/06/2014
3802 .\" Manual: MySQL Database System
3803 .\" Source: MySQL 5.5
3804 .\" Language: English
3805 .\"
3806-.TH "\FBMYSQLIMPORT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3807+.TH "\FBMYSQLIMPORT\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3808 .\" -----------------------------------------------------------------
3809 .\" * Define some portability stuff
3810 .\" -----------------------------------------------------------------
3811@@ -109,7 +109,7 @@
3812 .\" bind-address option: mysqlimport
3813 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
3814 .sp
3815-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
3816+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
3817 .sp
3818 This option is supported only in the version of
3819 \fBmysqlimport\fR
3820@@ -660,6 +660,26 @@
3821 .sp -1
3822 .IP \(bu 2.3
3823 .\}
3824+.\" mysqlimport: shared-memory-base-name option
3825+.\" shared-memory-base-name option: mysqlimport
3826+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
3827+.sp
3828+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
3829+MYSQL\&. The shared\-memory name is case sensitive\&.
3830+.sp
3831+The server must be started with the
3832+\fB\-\-shared\-memory\fR
3833+option to enable shared\-memory connections\&.
3834+.RE
3835+.sp
3836+.RS 4
3837+.ie n \{\
3838+\h'-04'\(bu\h'+03'\c
3839+.\}
3840+.el \{\
3841+.sp -1
3842+.IP \(bu 2.3
3843+.\}
3844 .\" mysqlimport: silent option
3845 .\" silent option: mysqlimport
3846 \fB\-\-silent\fR,
3847
3848=== modified file 'man/mysqlshow.1'
3849--- man/mysqlshow.1 2014-08-22 09:58:37 +0000
3850+++ man/mysqlshow.1 2014-09-24 09:49:11 +0000
3851@@ -2,12 +2,12 @@
3852 .\" Title: \fBmysqlshow\fR
3853 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3854 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3855-.\" Date: 07/18/2014
3856+.\" Date: 09/06/2014
3857 .\" Manual: MySQL Database System
3858 .\" Source: MySQL 5.5
3859 .\" Language: English
3860 .\"
3861-.TH "\FBMYSQLSHOW\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3862+.TH "\FBMYSQLSHOW\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3863 .\" -----------------------------------------------------------------
3864 .\" * Define some portability stuff
3865 .\" -----------------------------------------------------------------
3866@@ -156,7 +156,7 @@
3867 .\" bind-address option: mysqlshow
3868 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
3869 .sp
3870-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
3871+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
3872 .sp
3873 This option is supported only in the version of
3874 \fBmysqlshow\fR
3875@@ -532,6 +532,26 @@
3876 .sp -1
3877 .IP \(bu 2.3
3878 .\}
3879+.\" mysqlshow: shared-memory-base-name option
3880+.\" shared-memory-base-name option: mysqlshow
3881+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
3882+.sp
3883+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
3884+MYSQL\&. The shared\-memory name is case sensitive\&.
3885+.sp
3886+The server must be started with the
3887+\fB\-\-shared\-memory\fR
3888+option to enable shared\-memory connections\&.
3889+.RE
3890+.sp
3891+.RS 4
3892+.ie n \{\
3893+\h'-04'\(bu\h'+03'\c
3894+.\}
3895+.el \{\
3896+.sp -1
3897+.IP \(bu 2.3
3898+.\}
3899 .\" mysqlshow: show-table-type option
3900 .\" show-table-type option: mysqlshow
3901 \fB\-\-show\-table\-type\fR,
3902
3903=== modified file 'man/mysqlslap.1'
3904--- man/mysqlslap.1 2014-08-22 09:58:37 +0000
3905+++ man/mysqlslap.1 2014-09-24 09:49:11 +0000
3906@@ -2,12 +2,12 @@
3907 .\" Title: \fBmysqlslap\fR
3908 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3909 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3910-.\" Date: 07/18/2014
3911+.\" Date: 09/06/2014
3912 .\" Manual: MySQL Database System
3913 .\" Source: MySQL 5.5
3914 .\" Language: English
3915 .\"
3916-.TH "\FBMYSQLSLAP\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3917+.TH "\FBMYSQLSLAP\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3918 .\" -----------------------------------------------------------------
3919 .\" * Define some portability stuff
3920 .\" -----------------------------------------------------------------
3921
3922=== modified file 'man/mysqltest.1'
3923--- man/mysqltest.1 2014-08-22 09:58:37 +0000
3924+++ man/mysqltest.1 2014-09-24 09:49:11 +0000
3925@@ -2,12 +2,12 @@
3926 .\" Title: \fBmysqltest\fR
3927 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3928 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3929-.\" Date: 07/04/2014
3930+.\" Date: 09/05/2014
3931 .\" Manual: MySQL Database System
3932 .\" Source: MySQL
3933 .\" Language: English
3934 .\"
3935-.TH "\FBMYSQLTEST\FR" "1" "07/04/2014" "MySQL" "MySQL Database System"
3936+.TH "\FBMYSQLTEST\FR" "1" "09/05/2014" "MySQL" "MySQL Database System"
3937 .\" -----------------------------------------------------------------
3938 .\" * Define some portability stuff
3939 .\" -----------------------------------------------------------------
3940
3941=== modified file 'man/ndb-common-options.1'
3942--- man/ndb-common-options.1 2014-08-22 09:58:37 +0000
3943+++ man/ndb-common-options.1 2014-09-24 09:49:11 +0000
3944@@ -2,12 +2,12 @@
3945 .\" Title: Options Common to MySQL Cluster Programs
3946 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3947 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
3948-.\" Date: 07/18/2014
3949+.\" Date: 09/06/2014
3950 .\" Manual: MySQL Database System
3951 .\" Source: MySQL 5.5
3952 .\" Language: English
3953 .\"
3954-.TH "OPTIONS COMMON TO MY" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
3955+.TH "OPTIONS COMMON TO MY" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
3956 .\" -----------------------------------------------------------------
3957 .\" * Define some portability stuff
3958 .\" -----------------------------------------------------------------
3959@@ -97,7 +97,7 @@
3960 .nr an-no-space-flag 1
3961 .nr an-break-flag 1
3962 .br
3963-.B Table\ \&18.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2
3964+.B Table\ \&18.88.\ \& This table describes command-line options common to all MySQL Cluster programs
3965 .TS
3966 allbox tab(:);
3967 lB lB lB.
3968@@ -106,7 +106,7 @@
3969 T}:T{
3970 Description
3971 T}:T{
3972-Added / Removed
3973+Added or Removed
3974 T}
3975 .T&
3976 l l l
3977@@ -129,7 +129,7 @@
3978 Display help message and exit
3979 T}:T{
3980 .PP
3981-All MySQL 5\&.5 based releases
3982+All MySQL 5.5 based releases
3983 T}
3984 T{
3985 .PP
3986@@ -139,22 +139,22 @@
3987 .PP
3988 -c
3989 T}:T{
3990-Set connection string for connecting to ndb_mgmd\&. Syntax:
3991- [nodeid=<id>;][host=]<hostname>[:<port>]\&.
3992- Overrides entries specified in NDB_CONNECTSTRING or my\&.cnf\&.
3993+Set connection string for connecting to ndb_mgmd. Syntax:
3994+ [nodeid=<id>;][host=]<hostname>[:<port>].
3995+ Overrides entries specified in NDB_CONNECTSTRING or my.cnf.
3996 T}:T{
3997 .PP
3998-All MySQL 5\&.5 based releases
3999+All MySQL 5.5 based releases
4000 T}
4001 T{
4002 .PP
4003 --ndb-mgmd-host=host[:port]
4004 T}:T{
4005-Set the host (and port, if desired) for connecting to the management
4006- server
4007+Set the host (and port, if desired) for connecting to management
4008+ server
4009 T}:T{
4010 .PP
4011-All MySQL 5\&.5 based releases
4012+All MySQL 5.5 based releases
4013 T}
4014 T{
4015 .PP
4016@@ -163,7 +163,7 @@
4017 Set node id for this node
4018 T}:T{
4019 .PP
4020-All MySQL 5\&.5 based releases
4021+All MySQL 5.5 based releases
4022 T}
4023 T{
4024 .PP
4025@@ -172,26 +172,26 @@
4026 Select nodes for transactions in a more optimal way
4027 T}:T{
4028 .PP
4029-All MySQL 5\&.5 based releases
4030+All MySQL 5.5 based releases
4031 T}
4032 T{
4033 .PP
4034 --character-sets-dir=path
4035 T}:T{
4036-Directory where character sets are
4037+Directory where character sets are installed
4038 T}:T{
4039 .PP
4040-All MySQL 5\&.5 based releases
4041+All MySQL 5.5 based releases
4042 T}
4043 T{
4044 .PP
4045 --debug=options
4046 T}:T{
4047-Enable output from debug calls\&. Can be used only for versions compiled
4048- with debugging enabled
4049+Enable output from debug calls. Can be used only for versions
4050+ compiled with debugging enabled
4051 T}:T{
4052 .PP
4053-All MySQL 5\&.5 based releases
4054+All MySQL 5.5 based releases
4055 T}
4056 T{
4057 .PP
4058@@ -200,7 +200,7 @@
4059 Write core on errors (defaults to TRUE in debug builds)
4060 T}:T{
4061 .PP
4062-All MySQL 5\&.5 based releases
4063+All MySQL 5.5 based releases
4064 T}
4065 T{
4066 .PP
4067@@ -211,7 +211,7 @@
4068 Output version information and exit
4069 T}:T{
4070 .PP
4071-All MySQL 5\&.5 based releases
4072+All MySQL 5.5 based releases
4073 T}
4074 .TE
4075 .sp 1
4076
4077=== modified file 'man/ndb_blob_tool.1'
4078--- man/ndb_blob_tool.1 2014-08-22 09:58:37 +0000
4079+++ man/ndb_blob_tool.1 2014-09-24 09:49:11 +0000
4080@@ -2,12 +2,12 @@
4081 .\" Title: \fBndb_blob_tool\fR
4082 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4083 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4084-.\" Date: 07/18/2014
4085+.\" Date: 09/06/2014
4086 .\" Manual: MySQL Database System
4087 .\" Source: MySQL 5.5
4088 .\" Language: English
4089 .\"
4090-.TH "\FBNDB_BLOB_TOOL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4091+.TH "\FBNDB_BLOB_TOOL\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4092 .\" -----------------------------------------------------------------
4093 .\" * Define some portability stuff
4094 .\" -----------------------------------------------------------------
4095@@ -94,7 +94,7 @@
4096 .nr an-no-space-flag 1
4097 .nr an-break-flag 1
4098 .br
4099-.B Table\ \&18.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.2
4100+.B Table\ \&18.73.\ \& This table describes command-line options for the ndb_blob_tool program
4101 .TS
4102 allbox tab(:);
4103 lB lB lB.
4104@@ -103,7 +103,7 @@
4105 T}:T{
4106 Description
4107 T}:T{
4108-Added / Removed
4109+Added or Removed
4110 T}
4111 .T&
4112 l l l
4113@@ -118,7 +118,7 @@
4114 Check for orphan blob parts
4115 T}:T{
4116 .PP
4117-All MySQL 5\&.5 based releases
4118+All MySQL 5.5 based releases
4119 T}
4120 T{
4121 .PP
4122@@ -126,10 +126,10 @@
4123 .PP
4124 -d
4125 T}:T{
4126-Database to find the table in\&.
4127+Database to find the table in.
4128 T}:T{
4129 .PP
4130-All MySQL 5\&.5 based releases
4131+All MySQL 5.5 based releases
4132 T}
4133 T{
4134 .PP
4135@@ -138,7 +138,7 @@
4136 Delete orphan blob parts
4137 T}:T{
4138 .PP
4139-All MySQL 5\&.5 based releases
4140+All MySQL 5.5 based releases
4141 T}
4142 T{
4143 .PP
4144@@ -147,7 +147,7 @@
4145 Write orphan keys to specified file
4146 T}:T{
4147 .PP
4148-All MySQL 5\&.5 based releases
4149+All MySQL 5.5 based releases
4150 T}
4151 T{
4152 .PP
4153@@ -158,7 +158,7 @@
4154 Verbose output
4155 T}:T{
4156 .PP
4157-All MySQL 5\&.5 based releases
4158+All MySQL 5.5 based releases
4159 T}
4160 .TE
4161 .sp 1
4162
4163=== modified file 'man/ndb_config.1'
4164--- man/ndb_config.1 2014-08-22 09:58:37 +0000
4165+++ man/ndb_config.1 2014-09-24 09:49:11 +0000
4166@@ -2,12 +2,12 @@
4167 .\" Title: \fBndb_config\fR
4168 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4169 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4170-.\" Date: 07/18/2014
4171+.\" Date: 09/06/2014
4172 .\" Manual: MySQL Database System
4173 .\" Source: MySQL 5.5
4174 .\" Language: English
4175 .\"
4176-.TH "\FBNDB_CONFIG\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4177+.TH "\FBNDB_CONFIG\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4178 .\" -----------------------------------------------------------------
4179 .\" * Define some portability stuff
4180 .\" -----------------------------------------------------------------
4181@@ -69,7 +69,7 @@
4182 .nr an-no-space-flag 1
4183 .nr an-break-flag 1
4184 .br
4185-.B Table\ \&18.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.2
4186+.B Table\ \&18.74.\ \& This table describes command-line options for the ndb_config program
4187 .TS
4188 allbox tab(:);
4189 lB lB lB.
4190@@ -78,7 +78,7 @@
4191 T}:T{
4192 Description
4193 T}:T{
4194-Added / Removed
4195+Added or Removed
4196 T}
4197 .T&
4198 l l l
4199@@ -100,20 +100,20 @@
4200 .PP
4201 --nodes
4202 T}:T{
4203-Print node information (DB section) only\&.
4204+Print node information (DB section) only.
4205 T}:T{
4206 .PP
4207-All MySQL 5\&.5 based releases
4208+All MySQL 5.5 based releases
4209 T}
4210 T{
4211 .PP
4212 --connections
4213 T}:T{
4214-Print CONNECTIONS section information only\&. Cannot be used with \-\-nodes
4215- or \-\-system option\&.
4216+Print CONNECTIONS section information only. Cannot be used with
4217+ --nodes or --system option.
4218 T}:T{
4219 .PP
4220-All MySQL 5\&.5 based releases
4221+All MySQL 5.5 based releases
4222 T}
4223 T{
4224 .PP
4225@@ -124,7 +124,7 @@
4226 One or more query options (attributes)
4227 T}:T{
4228 .PP
4229-All MySQL 5\&.5 based releases
4230+All MySQL 5.5 based releases
4231 T}
4232 T{
4233 .PP
4234@@ -133,7 +133,7 @@
4235 Specify host
4236 T}:T{
4237 .PP
4238-All MySQL 5\&.5 based releases
4239+All MySQL 5.5 based releases
4240 T}
4241 T{
4242 .PP
4243@@ -142,7 +142,7 @@
4244 Specify node type
4245 T}:T{
4246 .PP
4247-All MySQL 5\&.5 based releases
4248+All MySQL 5.5 based releases
4249 T}
4250 T{
4251 .PP
4252@@ -153,7 +153,7 @@
4253 Get configuration of node with this ID
4254 T}:T{
4255 .PP
4256-All MySQL 5\&.5 based releases
4257+All MySQL 5.5 based releases
4258 T}
4259 T{
4260 .PP
4261@@ -164,7 +164,7 @@
4262 Field separator
4263 T}:T{
4264 .PP
4265-All MySQL 5\&.5 based releases
4266+All MySQL 5.5 based releases
4267 T}
4268 T{
4269 .PP
4270@@ -175,76 +175,76 @@
4271 Row separator
4272 T}:T{
4273 .PP
4274-All MySQL 5\&.5 based releases
4275+All MySQL 5.5 based releases
4276 T}
4277 T{
4278 .PP
4279 --config-file=path
4280 T}:T{
4281-Set the path to config\&.ini file
4282+Set the path to config.ini file
4283 T}:T{
4284 .PP
4285-All MySQL 5\&.5 based releases
4286+All MySQL 5.5 based releases
4287 T}
4288 T{
4289 .PP
4290 --mycnf
4291 T}:T{
4292-Read configuration data from my\&.cnf file
4293+Read configuration data from my.cnf file
4294 T}:T{
4295 .PP
4296-All MySQL 5\&.5 based releases
4297+All MySQL 5.5 based releases
4298 T}
4299 T{
4300 .PP
4301 -c
4302 T}:T{
4303-Short form for \-\-ndb\-connectstring
4304+Short form for --ndb-connectstring
4305 T}:T{
4306 .PP
4307-All MySQL 5\&.5 based releases
4308+All MySQL 5.5 based releases
4309 T}
4310 T{
4311 .PP
4312 --configinfo
4313 T}:T{
4314-Dumps information about all NDB configuration parameters in text format
4315- with default, maximum, and minimum values\&. Use with \-\-xml to
4316- obtain XML output\&.
4317+Dumps information about all NDB configuration parameters in text
4318+ format with default, maximum, and minimum values. Use with --xml
4319+ to obtain XML output.
4320 T}:T{
4321 .PP
4322-All MySQL 5\&.5 based releases
4323+All MySQL 5.5 based releases
4324 T}
4325 T{
4326 .PP
4327 --configinfo --xml
4328 T}:T{
4329-Use \-\-xml with \-\-configinfo to obtain a dump of all NDB configuration
4330- parameters in XML format with default, maximum, and minimum
4331- values\&.
4332+Use --xml with --configinfo to obtain a dump of all NDB
4333+ configuration parameters in XML format with default, maximum, and
4334+ minimum values.
4335 T}:T{
4336 .PP
4337-All MySQL 5\&.5 based releases
4338+All MySQL 5.5 based releases
4339 T}
4340 T{
4341 .PP
4342 --system
4343 T}:T{
4344-Print SYSTEM section information only\&. Cannot be used with \-\-nodes or
4345- \-\-connections option\&.
4346+Print SYSTEM section information only. Cannot be used with --nodes
4347+ or --connections option.
4348 T}:T{
4349 .PP
4350-All MySQL 5\&.5 based releases
4351+All MySQL 5.5 based releases
4352 T}
4353 T{
4354 .PP
4355 --config_from_node=#
4356 T}:T{
4357-Obtain configuration data from the node having this ID (must be a data
4358- node)\&.
4359+Obtain configuration data from the node having this ID (must be a
4360+ data node).
4361 T}:T{
4362 .PP
4363-All MySQL 5\&.5 based releases
4364+All MySQL 5.5 based releases
4365 T}
4366 .TE
4367 .sp 1
4368@@ -306,6 +306,7 @@
4369 l l s s
4370 ^ l l s
4371 ^ l l s
4372+^ l l s
4373 ^ l l s.
4374 T{
4375 \fBCommand\-Line Format\fR
4376@@ -328,9 +329,14 @@
4377 none
4378 T}
4379 :T{
4380-\fBRange\fR
4381-T}:T{
4382-1 \&.\&. 48
4383+\fBMin Value\fR
4384+T}:T{
4385+1
4386+T}
4387+:T{
4388+\fBMax Value\fR
4389+T}:T{
4390+48
4391 T}
4392 .TE
4393 .sp 1
4394@@ -1230,7 +1236,7 @@
4395 .\}
4396 .nf
4397 shell> \fBndb_config \-\-configinfo \-\-xml\fR
4398-<configvariables protocolversion="1" ndbversionstring="5\&.5\&.38\-ndb\-7\&.2\&.18"
4399+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.39\-ndb\-7\&.2\&.18"
4400 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
4401 ndbversionbuild="6">
4402 <section name="SYSTEM">
4403
4404=== modified file 'man/ndb_cpcd.1'
4405--- man/ndb_cpcd.1 2014-08-22 09:58:37 +0000
4406+++ man/ndb_cpcd.1 2014-09-24 09:49:11 +0000
4407@@ -2,12 +2,12 @@
4408 .\" Title: \fBndb_cpcd\fR
4409 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4410 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4411-.\" Date: 07/18/2014
4412+.\" Date: 09/06/2014
4413 .\" Manual: MySQL Database System
4414 .\" Source: MySQL 5.5
4415 .\" Language: English
4416 .\"
4417-.TH "\FBNDB_CPCD\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4418+.TH "\FBNDB_CPCD\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4419 .\" -----------------------------------------------------------------
4420 .\" * Define some portability stuff
4421 .\" -----------------------------------------------------------------
4422
4423=== modified file 'man/ndb_delete_all.1'
4424--- man/ndb_delete_all.1 2014-08-22 09:58:37 +0000
4425+++ man/ndb_delete_all.1 2014-09-24 09:49:11 +0000
4426@@ -2,12 +2,12 @@
4427 .\" Title: \fBndb_delete_all\fR
4428 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4429 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4430-.\" Date: 07/18/2014
4431+.\" Date: 09/06/2014
4432 .\" Manual: MySQL Database System
4433 .\" Source: MySQL 5.5
4434 .\" Language: English
4435 .\"
4436-.TH "\FBNDB_DELETE_ALL\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4437+.TH "\FBNDB_DELETE_ALL\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4438 .\" -----------------------------------------------------------------
4439 .\" * Define some portability stuff
4440 .\" -----------------------------------------------------------------
4441@@ -70,7 +70,7 @@
4442 .nr an-no-space-flag 1
4443 .nr an-break-flag 1
4444 .br
4445-.B Table\ \&18.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.2
4446+.B Table\ \&18.75.\ \& This table describes command-line options for the ndb_delete_all program
4447 .TS
4448 allbox tab(:);
4449 lB lB lB.
4450@@ -79,7 +79,7 @@
4451 T}:T{
4452 Description
4453 T}:T{
4454-Added / Removed
4455+Added or Removed
4456 T}
4457 .T&
4458 l l l
4459@@ -88,14 +88,14 @@
4460 l l l.
4461 T{
4462 .PP
4463-\-\-database=dbname,
4464+--database=dbname,
4465 .PP
4466-\-d
4467+-d
4468 T}:T{
4469 Name of the database in which the table is found
4470 T}:T{
4471 .PP
4472-All MySQL 5\&.5 based releases
4473+All MySQL 5.5 based releases
4474 T}
4475 T{
4476 .PP
4477@@ -103,28 +103,29 @@
4478 .PP
4479 -t
4480 T}:T{
4481-Perform the delete in a single transaction (may run out of operations)
4482+Perform the delete in a single transaction (may run out of
4483+ operations)
4484 T}:T{
4485 .PP
4486-All MySQL 5\&.5 based releases
4487+All MySQL 5.5 based releases
4488 T}
4489 T{
4490 .PP
4491-\-\-tupscan
4492+--tupscan
4493 T}:T{
4494 Run tup scan
4495 T}:T{
4496 .PP
4497-All MySQL 5\&.5 based releases
4498+All MySQL 5.5 based releases
4499 T}
4500 T{
4501 .PP
4502-\-\-diskscan
4503+--diskscan
4504 T}:T{
4505 Run disk scan
4506 T}:T{
4507 .PP
4508-All MySQL 5\&.5 based releases
4509+All MySQL 5.5 based releases
4510 T}
4511 .TE
4512 .sp 1
4513
4514=== modified file 'man/ndb_desc.1'
4515--- man/ndb_desc.1 2014-08-22 09:58:37 +0000
4516+++ man/ndb_desc.1 2014-09-24 09:49:11 +0000
4517@@ -2,12 +2,12 @@
4518 .\" Title: \fBndb_desc\fR
4519 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4520 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4521-.\" Date: 07/18/2014
4522+.\" Date: 09/06/2014
4523 .\" Manual: MySQL Database System
4524 .\" Source: MySQL 5.5
4525 .\" Language: English
4526 .\"
4527-.TH "\FBNDB_DESC\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4528+.TH "\FBNDB_DESC\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4529 .\" -----------------------------------------------------------------
4530 .\" * Define some portability stuff
4531 .\" -----------------------------------------------------------------
4532@@ -333,7 +333,7 @@
4533 .nr an-no-space-flag 1
4534 .nr an-break-flag 1
4535 .br
4536-.B Table\ \&18.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2
4537+.B Table\ \&18.76.\ \& This table describes command-line options for the ndb_desc program
4538 .TS
4539 allbox tab(:);
4540 lB lB lB.
4541@@ -342,7 +342,7 @@
4542 T}:T{
4543 Description
4544 T}:T{
4545-Added / Removed
4546+Added or Removed
4547 T}
4548 .T&
4549 l l l
4550@@ -358,11 +358,11 @@
4551 .PP
4552 -b
4553 T}:T{
4554-Include partition information for BLOB tables in output\&. Requires that
4555- the \-p option also be used
4556+Include partition information for BLOB tables in output. Requires
4557+ that the -p option also be used
4558 T}:T{
4559 .PP
4560-All MySQL 5\&.5 based releases
4561+All MySQL 5.5 based releases
4562 T}
4563 T{
4564 .PP
4565@@ -373,7 +373,7 @@
4566 Name of database containing table
4567 T}:T{
4568 .PP
4569-All MySQL 5\&.5 based releases
4570+All MySQL 5.5 based releases
4571 T}
4572 T{
4573 .PP
4574@@ -381,11 +381,11 @@
4575 .PP
4576 -n
4577 T}:T{
4578-Include partition\-to\-data\-node mappings in output\&. Requires that the \-p
4579- option also be used
4580+Include partition-to-data-node mappings in output. Requires that
4581+ the -p option also be used
4582 T}:T{
4583 .PP
4584-All MySQL 5\&.5 based releases
4585+All MySQL 5.5 based releases
4586 T}
4587 T{
4588 .PP
4589@@ -396,7 +396,7 @@
4590 Display information about partitions
4591 T}:T{
4592 .PP
4593-All MySQL 5\&.5 based releases
4594+All MySQL 5.5 based releases
4595 T}
4596 T{
4597 .PP
4598@@ -407,7 +407,7 @@
4599 Number of times to retry the connection (once per second)
4600 T}:T{
4601 .PP
4602-All MySQL 5\&.5 based releases
4603+All MySQL 5.5 based releases
4604 T}
4605 T{
4606 .PP
4607@@ -415,11 +415,11 @@
4608 .PP
4609 -t
4610 T}:T{
4611-Specify the table in which to find an index\&. When this option is used,
4612- \-p and \-n have no effect and are ignored\&.
4613+Specify the table in which to find an index. When this option is
4614+ used, -p and -n have no effect and are ignored.
4615 T}:T{
4616 .PP
4617-ADDED: NDB 7\&.2\&.9
4618+ADDED: NDB 7.2.9
4619 T}
4620 T{
4621 .PP
4622@@ -430,7 +430,7 @@
4623 Use unqualified table names
4624 T}:T{
4625 .PP
4626-All MySQL 5\&.5 based releases
4627+All MySQL 5.5 based releases
4628 T}
4629 .TE
4630 .sp 1
4631
4632=== modified file 'man/ndb_drop_index.1'
4633--- man/ndb_drop_index.1 2014-08-22 09:58:37 +0000
4634+++ man/ndb_drop_index.1 2014-09-24 09:49:11 +0000
4635@@ -2,12 +2,12 @@
4636 .\" Title: \fBndb_drop_index\fR
4637 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4638 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4639-.\" Date: 07/18/2014
4640+.\" Date: 09/06/2014
4641 .\" Manual: MySQL Database System
4642 .\" Source: MySQL 5.5
4643 .\" Language: English
4644 .\"
4645-.TH "\FBNDB_DROP_INDEX\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4646+.TH "\FBNDB_DROP_INDEX\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4647 .\" -----------------------------------------------------------------
4648 .\" * Define some portability stuff
4649 .\" -----------------------------------------------------------------
4650@@ -68,7 +68,7 @@
4651 .nr an-no-space-flag 1
4652 .nr an-break-flag 1
4653 .br
4654-.B Table\ \&18.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.2
4655+.B Table\ \&18.77.\ \& This table describes command-line options for the ndb_drop_index program
4656 .TS
4657 allbox tab(:);
4658 lB lB lB.
4659@@ -77,20 +77,20 @@
4660 T}:T{
4661 Description
4662 T}:T{
4663-Added / Removed
4664+Added or Removed
4665 T}
4666 .T&
4667 l l l.
4668 T{
4669 .PP
4670-\-\-database=dbname,
4671+--database=dbname,
4672 .PP
4673-\-d
4674+-d
4675 T}:T{
4676 Name of the database in which the table is found
4677 T}:T{
4678 .PP
4679-All MySQL 5\&.5 based releases
4680+All MySQL 5.5 based releases
4681 T}
4682 .TE
4683 .sp 1
4684@@ -123,7 +123,7 @@
4685 Reading table information for completion of table and column names
4686 You can turn off this feature to get a quicker startup with \-A
4687 Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.
4688-Your MySQL connection id is 7 to server version: 5\&.5\&.38\-ndb\-7\&.2\&.18
4689+Your MySQL connection id is 7 to server version: 5\&.5\&.39\-ndb\-7\&.2\&.18
4690 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
4691 mysql> \fBSHOW TABLES;\fR
4692 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
4693
4694=== modified file 'man/ndb_drop_table.1'
4695--- man/ndb_drop_table.1 2014-08-22 09:58:37 +0000
4696+++ man/ndb_drop_table.1 2014-09-24 09:49:11 +0000
4697@@ -2,12 +2,12 @@
4698 .\" Title: \fBndb_drop_table\fR
4699 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4700 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4701-.\" Date: 07/18/2014
4702+.\" Date: 09/06/2014
4703 .\" Manual: MySQL Database System
4704 .\" Source: MySQL 5.5
4705 .\" Language: English
4706 .\"
4707-.TH "\FBNDB_DROP_TABLE\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4708+.TH "\FBNDB_DROP_TABLE\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4709 .\" -----------------------------------------------------------------
4710 .\" * Define some portability stuff
4711 .\" -----------------------------------------------------------------
4712@@ -66,7 +66,7 @@
4713 .nr an-no-space-flag 1
4714 .nr an-break-flag 1
4715 .br
4716-.B Table\ \&18.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.2
4717+.B Table\ \&18.78.\ \& This table describes command-line options for the ndb_drop_table program
4718 .TS
4719 allbox tab(:);
4720 lB lB lB.
4721@@ -75,20 +75,20 @@
4722 T}:T{
4723 Description
4724 T}:T{
4725-Added / Removed
4726+Added or Removed
4727 T}
4728 .T&
4729 l l l.
4730 T{
4731 .PP
4732-\-\-database=dbname,
4733+--database=dbname,
4734 .PP
4735-\-d
4736+-d
4737 T}:T{
4738 Name of the database in which the table is found
4739 T}:T{
4740 .PP
4741-All MySQL 5\&.5 based releases
4742+All MySQL 5.5 based releases
4743 T}
4744 .TE
4745 .sp 1
4746
4747=== modified file 'man/ndb_error_reporter.1'
4748--- man/ndb_error_reporter.1 2014-08-22 09:58:37 +0000
4749+++ man/ndb_error_reporter.1 2014-09-24 09:49:11 +0000
4750@@ -2,12 +2,12 @@
4751 .\" Title: \fBndb_error_reporter\fR
4752 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4753 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4754-.\" Date: 07/18/2014
4755+.\" Date: 09/06/2014
4756 .\" Manual: MySQL Database System
4757 .\" Source: MySQL 5.5
4758 .\" Language: English
4759 .\"
4760-.TH "\FBNDB_ERROR_REPORTE" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4761+.TH "\FBNDB_ERROR_REPORTE" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4762 .\" -----------------------------------------------------------------
4763 .\" * Define some portability stuff
4764 .\" -----------------------------------------------------------------
4765@@ -58,7 +58,7 @@
4766 .nr an-no-space-flag 1
4767 .nr an-break-flag 1
4768 .br
4769-.B Table\ \&18.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.2
4770+.B Table\ \&18.79.\ \& This table describes command-line options for the ndb_error_reporter program
4771 .TS
4772 allbox tab(:);
4773 lB lB lB.
4774@@ -67,7 +67,7 @@
4775 T}:T{
4776 Description
4777 T}:T{
4778-Added / Removed
4779+Added or Removed
4780 T}
4781 .T&
4782 l l l
4783@@ -78,38 +78,39 @@
4784 .PP
4785 --connection-timeout=timeout
4786 T}:T{
4787-Number of seconds to wait when connecting to nodes before timing out\&.
4788+Number of seconds to wait when connecting to nodes before timing
4789+ out.
4790 T}:T{
4791 .PP
4792-ADDED: NDB 7\&.2\&.14
4793+ADDED: NDB 7.2.14
4794 T}
4795 T{
4796 .PP
4797 --dry-scp
4798 T}:T{
4799-Disable scp with remote hosts; used only for testing\&.
4800+Disable scp with remote hosts; used only for testing.
4801 T}:T{
4802 .PP
4803-ADDED: NDB 7\&.2\&.14
4804+ADDED: NDB 7.2.14
4805 T}
4806 T{
4807 .PP
4808 --fs
4809 T}:T{
4810-Include file system data in error report; can use a large amount of disk
4811- space
4812+Include file system data in error report; can use a large amount
4813+ of disk space
4814 T}:T{
4815 .PP
4816-All MySQL 5\&.5 based releases
4817+All MySQL 5.5 based releases
4818 T}
4819 T{
4820 .PP
4821 --skip-nodegroup=nodegroup_id
4822 T}:T{
4823-Skip all nodes in the node group having this ID\&.
4824+Skip all nodes in the node group having this ID.
4825 T}:T{
4826 .PP
4827-ADDED: NDB 7\&.2\&.14
4828+ADDED: NDB 7.2.14
4829 T}
4830 .TE
4831 .sp 1
4832
4833=== modified file 'man/ndb_index_stat.1'
4834--- man/ndb_index_stat.1 2014-08-22 09:58:37 +0000
4835+++ man/ndb_index_stat.1 2014-09-24 09:49:11 +0000
4836@@ -2,12 +2,12 @@
4837 .\" Title: \fBndb_index_stat\fR
4838 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4839 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
4840-.\" Date: 07/18/2014
4841+.\" Date: 09/06/2014
4842 .\" Manual: MySQL Database System
4843 .\" Source: MySQL 5.5
4844 .\" Language: English
4845 .\"
4846-.TH "\FBNDB_INDEX_STAT\FR" "1" "07/18/2014" "MySQL 5\&.5" "MySQL Database System"
4847+.TH "\FBNDB_INDEX_STAT\FR" "1" "09/06/2014" "MySQL 5\&.5" "MySQL Database System"
4848 .\" -----------------------------------------------------------------
4849 .\" * Define some portability stuff
4850 .\" -----------------------------------------------------------------
4851@@ -166,7 +166,7 @@
4852 .nr an-no-space-flag 1
4853 .nr an-break-flag 1
4854 .br
4855-.B Table\ \&18.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2
4856+.B Table\ \&18.80.\ \& This table describes command-line options for the ndb_index_stat program
4857 .TS
4858 allbox tab(:);
4859 lB lB lB.
4860@@ -175,7 +175,7 @@
4861 T}:T{
4862 Description
4863 T}:T{
4864-Added / Removed
4865+Added or Removed
4866 T}
4867 .T&
4868 l l l
4869@@ -194,140 +194,140 @@
4870 l l l.
4871 T{
4872 .PP
4873-\-\-database=name,
4874-.PP
4875-\-d
4876-T}:T{
4877-Name of the database containing the table\&.
4878-T}:T{
4879-.PP
4880-All MySQL 5\&.5 based releases
4881-T}
4882-T{
4883-.PP
4884-\-\-delete
4885-T}:T{
4886-Delete index statistics for the given table, stopping any auto\-update
4887- previously configured\&.
4888-T}:T{
4889-.PP
4890-All MySQL 5\&.5 based releases
4891-T}
4892-T{
4893-.PP
4894-\-\-update
4895-T}:T{
4896-Update index statistics for the given table, restarting any auto\-update
4897- previously configured\&.
4898-T}:T{
4899-.PP
4900-All MySQL 5\&.5 based releases
4901-T}
4902-T{
4903-.PP
4904-\-\-dump
4905-T}:T{
4906-Print the query cache\&.
4907-T}:T{
4908-.PP
4909-All MySQL 5\&.5 based releases
4910-T}
4911-T{
4912-.PP
4913-\-\-query=#
4914-T}:T{
4915-Perform a number of random range queries on first key attr (must be int
4916- unsigned)\&.
4917-T}:T{
4918-.PP
4919-All MySQL 5\&.5 based releases
4920-T}
4921-T{
4922-.PP
4923-\-\-sys\-drop
4924-T}:T{
4925-Drop any statistics tables and events in NDB kernel (all statistics are
4926- lost)
4927-T}:T{
4928-.PP
4929-All MySQL 5\&.5 based releases
4930-T}
4931-T{
4932-.PP
4933-\-\-sys\-create
4934-T}:T{
4935-Create all statistics tables and events in NDB kernel, if none of them
4936- already exist
4937-T}:T{
4938-.PP
4939-All MySQL 5\&.5 based releases
4940-T}
4941-T{
4942-.PP
4943-\-\-sys\-create\-if\-not\-exist
4944+--database=name,
4945+.PP
4946+-d
4947+T}:T{
4948+Name of the database containing the table.
4949+T}:T{
4950+.PP
4951+All MySQL 5.5 based releases
4952+T}
4953+T{
4954+.PP
4955+--delete
4956+T}:T{
4957+Delete index statistics for the given table, stopping any
4958+ auto-update previously configured.
4959+T}:T{
4960+.PP
4961+All MySQL 5.5 based releases
4962+T}
4963+T{
4964+.PP
4965+--update
4966+T}:T{
4967+Update index statistics for the given table, restarting any
4968+ auto-update previously configured.
4969+T}:T{
4970+.PP
4971+All MySQL 5.5 based releases
4972+T}
4973+T{
4974+.PP
4975+--dump
4976+T}:T{
4977+Print the query cache.
4978+T}:T{
4979+.PP
4980+All MySQL 5.5 based releases
4981+T}
4982+T{
4983+.PP
4984+--query=#
4985+T}:T{
4986+Perform a number of random range queries on first key attr (must
4987+ be int unsigned).
4988+T}:T{
4989+.PP
4990+All MySQL 5.5 based releases
4991+T}
4992+T{
4993+.PP
4994+--sys-drop
4995+T}:T{
4996+Drop any statistics tables and events in NDB kernel (all
4997+ statistics are lost)
4998+T}:T{
4999+.PP
5000+All MySQL 5.5 based releases
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches