Merge lp:~sergei.glushchenko/percona-server/5.5-ps-blueprint-audit-log-streaming into lp:percona-server/5.5

Proposed by Sergei Glushchenko on 2014-06-10
Status: Merged
Approved by: Laurynas Biveinis on 2014-07-31
Approved revision: 672
Merged at revision: 689
Proposed branch: lp:~sergei.glushchenko/percona-server/5.5-ps-blueprint-audit-log-streaming
Merge into: lp:percona-server/5.5
Prerequisite: lp:~sergei.glushchenko/percona-server/5.5-ps-bug1320879
Diff against target: 3947 lines (+2033/-136) (has conflicts)
98 files modified
VERSION (+5/-0)
build-ps/debian/changelog (+51/-0)
doc/source/release-notes/release-notes_index.rst (+5/-0)
doc/source/upstream-bug-fixes.rst (+85/-0)
man/comp_err.1 (+8/-0)
man/innochecksum.1 (+8/-0)
man/msql2mysql.1 (+8/-0)
man/my_print_defaults.1 (+8/-0)
man/myisam_ftdump.1 (+8/-0)
man/myisamchk.1 (+13/-0)
man/myisamlog.1 (+8/-0)
man/myisampack.1 (+8/-0)
man/mysql-stress-test.pl.1 (+8/-0)
man/mysql-test-run.pl.1 (+8/-0)
man/mysql.1 (+8/-0)
man/mysql.server.1 (+8/-0)
man/mysql_client_test.1 (+8/-0)
man/mysql_config.1 (+8/-0)
man/mysql_convert_table_format.1 (+8/-0)
man/mysql_find_rows.1 (+8/-0)
man/mysql_fix_extensions.1 (+8/-0)
man/mysql_install_db.1 (+8/-0)
man/mysql_plugin.1 (+8/-0)
man/mysql_secure_installation.1 (+8/-0)
man/mysql_setpermission.1 (+8/-0)
man/mysql_tzinfo_to_sql.1 (+8/-0)
man/mysql_upgrade.1 (+8/-0)
man/mysql_waitpid.1 (+8/-0)
man/mysql_zap.1 (+8/-0)
man/mysqlaccess.1 (+8/-0)
man/mysqladmin.1 (+8/-0)
man/mysqlbinlog.1 (+8/-0)
man/mysqlbug.1 (+8/-0)
man/mysqlcheck.1 (+8/-0)
man/mysqld.8 (+8/-0)
man/mysqld_multi.1 (+8/-0)
man/mysqld_safe.1 (+8/-0)
man/mysqldump.1 (+8/-0)
man/mysqldumpslow.1 (+8/-0)
man/mysqlhotcopy.1 (+8/-0)
man/mysqlimport.1 (+8/-0)
man/mysqlshow.1 (+8/-0)
man/mysqlslap.1 (+8/-0)
man/mysqltest.1 (+8/-0)
man/ndb-common-options.1 (+8/-0)
man/ndb_blob_tool.1 (+8/-0)
man/ndb_config.1 (+12/-0)
man/ndb_cpcd.1 (+8/-0)
man/ndb_delete_all.1 (+8/-0)
man/ndb_desc.1 (+8/-0)
man/ndb_drop_index.1 (+12/-0)
man/ndb_drop_table.1 (+8/-0)
man/ndb_error_reporter.1 (+8/-0)
man/ndb_index_stat.1 (+8/-0)
man/ndb_mgm.1 (+8/-0)
man/ndb_mgmd.8 (+8/-0)
man/ndb_print_backup_file.1 (+8/-0)
man/ndb_print_schema_file.1 (+8/-0)
man/ndb_print_sys_file.1 (+8/-0)
man/ndb_restore.1 (+8/-0)
man/ndb_select_all.1 (+8/-0)
man/ndb_select_count.1 (+8/-0)
man/ndb_show_tables.1 (+8/-0)
man/ndb_size.pl.1 (+8/-0)
man/ndb_waiter.1 (+8/-0)
man/ndbd.8 (+8/-0)
man/ndbd_redo_log_reader.1 (+8/-0)
man/ndbinfo_select_all.1 (+8/-0)
man/ndbmtd.8 (+8/-0)
man/perror.1 (+8/-0)
man/replace.1 (+8/-0)
man/resolve_stack_dump.1 (+8/-0)
man/resolveip.1 (+8/-0)
mysql-test/r/audit_log_csv.result (+84/-0)
mysql-test/r/audit_log_json.result (+84/-0)
mysql-test/r/audit_log_new.result (+84/-0)
mysql-test/r/audit_log_old.result (+84/-0)
mysql-test/r/audit_log_syslog.result (+83/-0)
mysql-test/t/audit_log-master.opt (+0/-4)
mysql-test/t/audit_log_csv-master.opt (+5/-0)
mysql-test/t/audit_log_csv.test (+20/-0)
mysql-test/t/audit_log_json-master.opt (+5/-0)
mysql-test/t/audit_log_json.test (+18/-0)
mysql-test/t/audit_log_new-master.opt (+6/-0)
mysql-test/t/audit_log_new.test (+15/-0)
mysql-test/t/audit_log_old-master.opt (+5/-0)
mysql-test/t/audit_log_old.test (+15/-0)
mysql-test/t/audit_log_syslog-master.opt (+7/-0)
mysql-test/t/audit_log_syslog.test (+3/-0)
packaging/rpm-oel/mysql.spec.in (+55/-1)
plugin/audit_log/CMakeLists.txt (+2/-1)
plugin/audit_log/audit_file.c (+200/-0)
plugin/audit_log/audit_handler.h (+116/-0)
plugin/audit_log/audit_log.c (+320/-128)
plugin/audit_log/audit_syslog.c (+91/-0)
plugin/audit_log/buffer.h (+11/-2)
plugin/audit_log/logger.h (+5/-0)
storage/innobase/include/univ.i (+4/-0)
Text conflict in VERSION
Text conflict in build-ps/debian/changelog
Text conflict in doc/source/release-notes/release-notes_index.rst
Text conflict in doc/source/upstream-bug-fixes.rst
Text conflict in man/comp_err.1
Text conflict in man/innochecksum.1
Text conflict in man/msql2mysql.1
Text conflict in man/my_print_defaults.1
Text conflict in man/myisam_ftdump.1
Text conflict in man/myisamchk.1
Text conflict in man/myisamlog.1
Text conflict in man/myisampack.1
Text conflict in man/mysql-stress-test.pl.1
Text conflict in man/mysql-test-run.pl.1
Text conflict in man/mysql.1
Text conflict in man/mysql.server.1
Text conflict in man/mysql_client_test.1
Text conflict in man/mysql_config.1
Text conflict in man/mysql_convert_table_format.1
Text conflict in man/mysql_find_rows.1
Text conflict in man/mysql_fix_extensions.1
Text conflict in man/mysql_install_db.1
Text conflict in man/mysql_plugin.1
Text conflict in man/mysql_secure_installation.1
Text conflict in man/mysql_setpermission.1
Text conflict in man/mysql_tzinfo_to_sql.1
Text conflict in man/mysql_upgrade.1
Text conflict in man/mysql_waitpid.1
Text conflict in man/mysql_zap.1
Text conflict in man/mysqlaccess.1
Text conflict in man/mysqladmin.1
Text conflict in man/mysqlbinlog.1
Text conflict in man/mysqlbug.1
Text conflict in man/mysqlcheck.1
Text conflict in man/mysqld.8
Text conflict in man/mysqld_multi.1
Text conflict in man/mysqld_safe.1
Text conflict in man/mysqldump.1
Text conflict in man/mysqldumpslow.1
Text conflict in man/mysqlhotcopy.1
Text conflict in man/mysqlimport.1
Text conflict in man/mysqlshow.1
Text conflict in man/mysqlslap.1
Text conflict in man/mysqltest.1
Text conflict in man/ndb-common-options.1
Text conflict in man/ndb_blob_tool.1
Text conflict in man/ndb_config.1
Text conflict in man/ndb_cpcd.1
Text conflict in man/ndb_delete_all.1
Text conflict in man/ndb_desc.1
Text conflict in man/ndb_drop_index.1
Text conflict in man/ndb_drop_table.1
Text conflict in man/ndb_error_reporter.1
Text conflict in man/ndb_index_stat.1
Text conflict in man/ndb_mgm.1
Text conflict in man/ndb_mgmd.8
Text conflict in man/ndb_print_backup_file.1
Text conflict in man/ndb_print_schema_file.1
Text conflict in man/ndb_print_sys_file.1
Text conflict in man/ndb_restore.1
Text conflict in man/ndb_select_all.1
Text conflict in man/ndb_select_count.1
Text conflict in man/ndb_show_tables.1
Text conflict in man/ndb_size.pl.1
Text conflict in man/ndb_waiter.1
Text conflict in man/ndbd.8
Text conflict in man/ndbd_redo_log_reader.1
Text conflict in man/ndbinfo_select_all.1
Text conflict in man/ndbmtd.8
Text conflict in man/perror.1
Text conflict in man/replace.1
Text conflict in man/resolve_stack_dump.1
Text conflict in man/resolveip.1
Contents conflict in mysql-test/r/audit_log.result
Contents conflict in mysql-test/t/audit_log.test
Text conflict in packaging/rpm-oel/mysql.spec.in
Text conflict in plugin/audit_log/audit_log.c
Text conflict in plugin/audit_log/logger.h
Text conflict in storage/innobase/include/univ.i
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.5-ps-blueprint-audit-log-streaming
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-06-10 Approve on 2014-07-31
Review via email: mp+222602@code.launchpad.net
To post a comment you must log in.

    - Launchpad says the prerequisite branch does not exist. Is the
      prerequisite branch the CSV/JSON one and was it repushed after
      this branch was pushed? If so, rebase this on the updated prereq
      branch to avoid any surprises.
    - Bump plugin_version (for this and for the CSV/JSON MP, already merged)
    - Let's split audit_log.test to audit_log_foo.test, where instead
      of each restart each split testcase has -master.opt file that
      sets up auditing.
    - 1283: s/hadler/handler
    - 1321: "The string that will be prepended to each log message, if
      syslog handler is used"
    - 1333: clarify it's the syslog facility, not something else,
      i.e. "The syslog facility to use, if syslog handler is used"
      (might need further editing)
    - Clarify that strategy, buffer_size, rotate_on_size, rotations,
      file only apply to file handler. Add this to blueprint (for docs
      updating)
    - Add to blueprint (for the later documenting) what does
      "flushing" the syslog mean.
    - TYPELIBs are formatted with source code indentation of 4 whereas
      the rest use 2

review: Needs Fixing

Done:
- bump plugin_version
- split audit_log.test into
  - audit_log_old.test
  - audit_log_new.test
  - audit_log_json.test
  - audit_log_csv.test
  - audit_log_syslog.test
- fixed typos and rephrased as suggested
- blueprint updated
- rebased on latest GCA.

Unfortunately 5.5 is not at the point where CSV/JSON patch is merged yet, so it causes criss-cross merge when trying to merge into lp:percona-server/5.5. Two options available wait for 5.5 catch up to include CVS/JSON branch or resolve conflicts manually.

Results of testing:
http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1032/

Actually things are not that bad as LP pictures.
Actual conflicts upon merge are:
Warning: criss-cross merge encountered. See bzr help criss-cross.
+N mysql-test/r/audit_log_csv.result
+N mysql-test/r/audit_log_json.result
+N mysql-test/r/audit_log_new.result
+N mysql-test/r/audit_log_old.result
+N mysql-test/r/audit_log_syslog.result
+N mysql-test/t/audit_log_csv-master.opt
+N mysql-test/t/audit_log_csv.test
+N mysql-test/t/audit_log_json-master.opt
+N mysql-test/t/audit_log_json.test
+N mysql-test/t/audit_log_new-master.opt
+N mysql-test/t/audit_log_new.test
+N mysql-test/t/audit_log_old-master.opt
+N mysql-test/t/audit_log_old.test
+N mysql-test/t/audit_log_syslog-master.opt
+N mysql-test/t/audit_log_syslog.test
+N plugin/audit_log/audit_file.c
+N plugin/audit_log/audit_handler.h
+N plugin/audit_log/audit_syslog.c
RM mysql-test/r/audit_log.result => mysql-test/r/audit_log.result.THIS
-D mysql-test/t/audit_log-master.opt
RM mysql-test/t/audit_log.test => mysql-test/t/audit_log.test.THIS
 M plugin/audit_log/CMakeLists.txt
 M plugin/audit_log/audit_log.c
 M plugin/audit_log/buffer.h
 M plugin/audit_log/logger.h
Contents conflict in mysql-test/r/audit_log.result
Contents conflict in mysql-test/t/audit_log.test
Text conflict in plugin/audit_log/audit_log.c
Text conflict in plugin/audit_log/logger.h
4 conflicts encountered.

Resolution is to delete audit_log.result, audit_log.test. And to manually resolve pieces of audit_log.c and logger.h.

Hmm... or prerequisite is specified wrongly...

Well, prerequisite branch indeed was wrong but LP still showing huge amount of errors. I tried to merge with latest branched lp:percona-server/5.5 and it all merged cleanly.

Since the prerequisite branch is already in the trunk, it is a good idea to remove its merge from branch. That may or may not resolve the diff issue

It is in the trunk, but it is not in GCA for 5.5

Right, sorry.

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-06-11 13:42:04 +0000
3+++ VERSION 2014-07-30 19:40:33 +0000
4@@ -1,4 +1,9 @@
5 MYSQL_VERSION_MAJOR=5
6 MYSQL_VERSION_MINOR=5
7+<<<<<<< TREE
8 MYSQL_VERSION_PATCH=38
9 MYSQL_VERSION_EXTRA=-35.2
10+=======
11+MYSQL_VERSION_PATCH=37
12+MYSQL_VERSION_EXTRA=-35.1
13+>>>>>>> MERGE-SOURCE
14
15=== modified file 'build-ps/debian/changelog'
16--- build-ps/debian/changelog 2014-06-27 13:22:33 +0000
17+++ build-ps/debian/changelog 2014-07-30 19:40:33 +0000
18@@ -1,3 +1,4 @@
19+<<<<<<< TREE
20 percona-server-5.5 (5.5.38-rel35.2) unstable; urgency=low
21
22 * Fixed missing libperconaserverclient lib in lucid/squeeze
23@@ -52,6 +53,56 @@
24
25 -- Ignacio Nin <ignacio.nin@percona.com> Mon, 28 Oct 2013 10:31:09 +0100
26
27+=======
28+percona-server-5.5 (5.5.37-rel35.1) unstable; urgency=low
29+
30+ * UDF and HandlerSocket moved to plugin
31+ * Fixed version reported by mysql client
32+
33+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Thu, 29 May 2014 11:14:29 +0200
34+
35+percona-server-5.5 (5.5.37-rel35.0) unstable; urgency=low
36+
37+ * Fixed provides/breaks/replaces for client/server debian packages
38+
39+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Sat, 26 Apr 2014 15:54:31 +0200
40+
41+percona-server-5.5 (5.5.36-rel34.2) unstable; urgency=low
42+
43+ * Release 5.5.36-34.2
44+ * Added UDF and HandlerSocket
45+ * Reverted change of location from /usr/share/percona-server to /usr/share/mysql
46+
47+ -- Alexey Bychko <alexey.bychko@percona.com> Tue, 25 Mar 2014 11:04:59 +0100
48+
49+percona-server-5.5 (5.5.36-rel34.1) unstable; urgency=low
50+
51+ * Release 5.5.36-34.1
52+
53+ -- Alexey Bychko <alexey.bychko@percona.com> Tue, 17 Mar 2014 10:57:09 +0100
54+
55+percona-server-5.5 (5.5.36-rel34.0) unstable; urgency=low
56+
57+ * Release 5.5.36-34.0
58+ * Resolved: Multiple arch installation of libmysqlclient18 broken
59+
60+ -- Alexey Bychko <alexey.bychko@percona.com> Tue, 10 Mar 2014 10:44:46 +0100
61+
62+percona-server-5.5 (5.5.35-rel33.0) unstable; urgency=low
63+
64+ * Release 5.5.35-33.0
65+
66+ -- Ignacio Nin <ignacio.nin@percona.com> Fri, 20 Dec 2013 10:40:29 +0100
67+
68+percona-server-5.5 (5.5.34-rel32.0) unstable; urgency=low
69+
70+ * Release 5.5.34-32.0
71+ * Resolved: apt-upgrading percona-server fails in post-installation
72+ * Resolved: libmysqlclient18-dev doesn't provide libmysqlclient-dev
73+
74+ -- Ignacio Nin <ignacio.nin@percona.com> Mon, 28 Oct 2013 10:31:09 +0100
75+
76+>>>>>>> MERGE-SOURCE
77 percona-server-5.5 (5.5.33-rel31.1) unstable; urgency=low
78
79 * Remove the info entry for mysql.info, which was pointless.
80
81=== modified file 'doc/source/release-notes/release-notes_index.rst'
82--- doc/source/release-notes/release-notes_index.rst 2014-07-30 10:29:34 +0000
83+++ doc/source/release-notes/release-notes_index.rst 2014-07-30 19:40:33 +0000
84@@ -6,9 +6,14 @@
85 :maxdepth: 1
86 :glob:
87
88+<<<<<<< TREE
89 Percona-Server-5.5.38-35.2
90 Percona-Server-5.5.37-35.1
91 Percona-Server-5.5.37-35.0
92+=======
93+ Percona-Server-5.5.37-35.1
94+ Percona-Server-5.5.37-35.0
95+>>>>>>> MERGE-SOURCE
96 Percona-Server-5.5.36-34.2
97 Percona-Server-5.5.36-34.1
98 Percona-Server-5.5.36-34.0
99
100=== modified file 'doc/source/upstream-bug-fixes.rst'
101--- doc/source/upstream-bug-fixes.rst 2014-07-30 10:29:34 +0000
102+++ doc/source/upstream-bug-fixes.rst 2014-07-30 19:40:33 +0000
103@@ -5,6 +5,7 @@
104 =============================================================
105
106 +-------------------------------------------------------------------------------------------------------------+
107+<<<<<<< TREE
108 |:Upstream bug: :mysqlbug:`60782` - Audit plugin API: no MYSQL_AUDIT_GENERAL_LOG notifications with general...|
109 |:Launchpad bug: :bug:`1182535` |
110 |:Upstream state: Verified (checked on 2014-07-01) |
111@@ -23,15 +24,43 @@
112 |:Fix Released: :rn:`5.5.37-35.0` |
113 |:Upstream fix: N/A |
114 +-------------------------------------------------------------------------------------------------------------+
115+=======
116+|:Upstream bug: :mysqlbug:`60782` - Audit plugin API: no MYSQL_AUDIT_GENERAL_LOG notifications with general...|
117+|:Launchpad bug: :bug:`1182535` |
118+|:Upstream state: Verified (checked on 2014-05-29) |
119+|:Fix Released: :rn:`5.5.37-35.0` |
120+|:Upstream fix: N/A |
121++-------------------------------------------------------------------------------------------------------------+
122+|:Upstream bug: :mysqlbug:`67352` - table_id is defined differently in sql/table.h vs sql/log_event.h |
123+|:Launchpad bug: :bug:`1070255` |
124+|:Upstream state: Closed |
125+|:Fix Released: :rn:`5.5.37-35.0` |
126+|:Upstream fix: N/A |
127++-------------------------------------------------------------------------------------------------------------+
128+|:Upstream bug: :mysqlbug:`71250` - Bison 3 breaks mysql build |
129+|:Launchpad bug: :bug:`1262439` |
130+|:Upstream state: Closed |
131+|:Fix Released: :rn:`5.5.37-35.0` |
132+|:Upstream fix: N/A |
133++-------------------------------------------------------------------------------------------------------------+
134+>>>>>>> MERGE-SOURCE
135 |:Upstream bug: :mysqlbug:`71375` - Slave IO thread won't attempt auto reconnect to the master/error-code 1593|
136 |:Launchpad bug: :bug:`1268735` |
137+<<<<<<< TREE
138 |:Upstream state: Verified (checked on 2014-07-01) |
139+=======
140+|:Upstream state: Verified (checked on 2014-05-29) |
141+>>>>>>> MERGE-SOURCE
142 |:Fix Released: :rn:`5.5.36-34.1` |
143 |:Upstream fix: N/A |
144 +-------------------------------------------------------------------------------------------------------------+
145 |:Upstream bug: :mysqlbug:`71374` - Slave IO thread won't attempt auto reconnect to the master/error-code 1159|
146 |:Launchpad bug: :bug:`1268729` |
147+<<<<<<< TREE
148 |:Upstream state: Verified (checked on 2014-07-01) |
149+=======
150+|:Upstream state: Verified (checked on 2014-05-29) |
151+>>>>>>> MERGE-SOURCE
152 |:Fix Released: :rn:`5.5.36-34.1` |
153 |:Upstream fix: N/A |
154 +-------------------------------------------------------------------------------------------------------------+
155@@ -61,7 +90,11 @@
156 +-------------------------------------------------------------------------------------------------------------+
157 |:Upstream bug: :mysqlbug:`69639` - mysql failed to build with dtrace Sun D 1.11 |
158 |:Launchpad bug: :bug:`1196460` |
159+<<<<<<< TREE
160 |:Upstream state: Open (checked on 2014-07-01) |
161+=======
162+|:Upstream state: Open (checked on 2014-05-29) |
163+>>>>>>> MERGE-SOURCE
164 |:Fix Released: :rn:`5.5.33-31.1` |
165 |:Upstream fix: N/A |
166 +-------------------------------------------------------------------------------------------------------------+
167@@ -73,7 +106,11 @@
168 +-------------------------------------------------------------------------------------------------------------+
169 |:Upstream bug: :mysqlbug:`42415` - UPDATE/DELETE with LIMIT clause unsafe for SBL even with ORDER BY PK ... |
170 |:Launchpad bug: :bug:`1132194` |
171+<<<<<<< TREE
172 |:Upstream state: Verified (checked on 2014-07-01) |
173+=======
174+|:Upstream state: Verified (checked on 2014-05-29) |
175+>>>>>>> MERGE-SOURCE
176 |:Fix Released: :rn:`5.5.32-31.0` |
177 |:Upstream fix: N/A |
178 +-------------------------------------------------------------------------------------------------------------+
179@@ -85,7 +122,11 @@
180 +-------------------------------------------------------------------------------------------------------------+
181 |:Upstream bug: :mysqlbug:`68970` - fsp_reserve_free_extents switches from small to big tblspace handling ... |
182 |:Launchpad bug: :bug:`1169494` |
183+<<<<<<< TREE
184 |:Upstream state: Verified (checked on 2014-07-01) |
185+=======
186+|:Upstream state: Verified (checked on 2014-05-29) |
187+>>>>>>> MERGE-SOURCE
188 |:Fix Released: :rn:`5.5.32-31.0` |
189 |:Upstream fix: N/A |
190 +-------------------------------------------------------------------------------------------------------------+
191@@ -97,7 +138,11 @@
192 +-------------------------------------------------------------------------------------------------------------+
193 |:Upstream bug: :mysqlbug:`68999` - SSL_OP_NO_COMPRESSION not defined |
194 |:Launchpad bug: :bug:`1183610` |
195+<<<<<<< TREE
196 |:Upstream state: No Feedback (checked on 2014-07-01) |
197+=======
198+|:Upstream state: No Feedback (checked on 2014-05-29) |
199+>>>>>>> MERGE-SOURCE
200 |:Fix Released: :rn:`5.5.31-30.3` |
201 |:Upstream fix: N/A |
202 +-------------------------------------------------------------------------------------------------------------+
203@@ -109,7 +154,11 @@
204 +-------------------------------------------------------------------------------------------------------------+
205 |:Upstream bug: :mysqlbug:`68845` - Unnecessary log_sys->mutex reacquisition in mtr_log_reserve_and_write() |
206 |:Launchpad bug: :bug:`1163439` |
207+<<<<<<< TREE
208 |:Upstream state: Verified (checked on 2014-07-01) |
209+=======
210+|:Upstream state: Verified (checked on 2014-05-29) |
211+>>>>>>> MERGE-SOURCE
212 |:Fix Released: :rn:`5.5.30-30.2` |
213 |:Upstream fix: N/A |
214 +-------------------------------------------------------------------------------------------------------------+
215@@ -139,13 +188,21 @@
216 +-------------------------------------------------------------------------------------------------------------+
217 |:Upstream bug: :mysqlbug:`68476` - Suboptimal code in my_strnxfrm_simple() |
218 |:Launchpad bug: :bug:`1132350` |
219+<<<<<<< TREE
220 |:Upstream state: Verified (checked on 2014-07-01) |
221+=======
222+|:Upstream state: Verified (checked on 2014-05-29) |
223+>>>>>>> MERGE-SOURCE
224 |:Fix Released: :rn:`5.5.30-30.1` |
225 |:Upstream fix: N/A |
226 +-------------------------------------------------------------------------------------------------------------+
227 |:Upstream bug: :mysqlbug:`68116` - InnoDB monitor may hit an assertion error in buf_page_get_gen in debug ...|
228 |:Launchpad bug: :bug:`1100178` |
229+<<<<<<< TREE
230 |:Upstream state: Verified (checked on 2014-07-01) |
231+=======
232+|:Upstream state: Verified (checked on 2014-05-29) |
233+>>>>>>> MERGE-SOURCE
234 |:Fix Released: :rn:`5.5.29-30.0` |
235 |:Upstream fix: N/A |
236 +-------------------------------------------------------------------------------------------------------------+
237@@ -247,7 +304,11 @@
238 +-------------------------------------------------------------------------------------------------------------+
239 |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..|
240 |:Launchpad bug: :bug:`1042517` |
241+<<<<<<< TREE
242 |:Upstream state: Verified (checked on 2014-07-01) |
243+=======
244+|:Upstream state: Verified (checked on 2014-05-29) |
245+>>>>>>> MERGE-SOURCE
246 |:Fix Released: :rn:`5.5.27-29.0` |
247 |:Upstream fix: N/A |
248 +-------------------------------------------------------------------------------------------------------------+
249@@ -259,7 +320,11 @@
250 +-------------------------------------------------------------------------------------------------------------+
251 |:Upstream bug: :mysqlbug:`64800` - mysqldump with --include-master-host-port putting quotes around port no. |
252 |:Launchpad bug: :bug:`1013432` |
253+<<<<<<< TREE
254 |:Upstream state: Verified (checked on 2014-07-01) |
255+=======
256+|:Upstream state: Verified (checked on 2014-05-29) |
257+>>>>>>> MERGE-SOURCE
258 |:Fix Released: :rn:`5.5.27-28.0` |
259 |:Upstream fix: N/A |
260 +-------------------------------------------------------------------------------------------------------------+
261@@ -307,7 +372,11 @@
262 +-------------------------------------------------------------------------------------------------------------+
263 |:Upstream bug: :mysqlbug:`71183` - os_file_fsync() should handle fsync() returning EINTR |
264 |:Launchpad bug: :bug:`1262651` |
265+<<<<<<< TREE
266 |:Upstream state: Verified (checked on 2014-07-01) |
267+=======
268+|:Upstream state: Verified (checked on 2014-05-29) |
269+>>>>>>> MERGE-SOURCE
270 |:Fix Released: :rn:`5.5.20-24.1` |
271 |:Upstream fix: N/A |
272 +-------------------------------------------------------------------------------------------------------------+
273@@ -331,13 +400,21 @@
274 +-------------------------------------------------------------------------------------------------------------+
275 |:Upstream bug: :mysqlbug:`62516` - Fast index creation does not update index statistics |
276 |:Launchpad bug: :bug:`857590` |
277+<<<<<<< TREE
278 |:Upstream state: Verified (checked on 2014-07-01) |
279+=======
280+|:Upstream state: Verified (checked on 2014-05-29) |
281+>>>>>>> MERGE-SOURCE
282 |:Fix Released: :rn:`5.5.16-22.0` |
283 |:Upstream fix: N/A |
284 +-------------------------------------------------------------------------------------------------------------+
285 |:Upstream bug: :mysqlbug:`25007` - memory tables with dynamic rows format |
286 |:Launchpad bug: N/A |
287+<<<<<<< TREE
288 |:Upstream state: Verified (checked on 2014-07-01) |
289+=======
290+|:Upstream state: Verified (checked on 2014-05-29) |
291+>>>>>>> MERGE-SOURCE
292 |:Fix Released: :rn:`5.5.15-21.0` |
293 |:Upstream fix: N/A |
294 +-------------------------------------------------------------------------------------------------------------+
295@@ -355,7 +432,11 @@
296 +-------------------------------------------------------------------------------------------------------------+
297 |:Upstream bug: :mysqlbug:`61595` - mysql-test/include/wait_for_slave_param.inc timeout logic is incorrect |
298 |:Launchpad bug: :bug:`800035` |
299+<<<<<<< TREE
300 |:Upstream state: Verified (checked on 2014-07-01) |
301+=======
302+|:Upstream state: Verified (checked on 2014-05-29) |
303+>>>>>>> MERGE-SOURCE
304 |:Fix Released: :rn:`5.5.13-20.4` |
305 |:Upstream fix: N/A |
306 +-------------------------------------------------------------------------------------------------------------+
307@@ -385,7 +466,11 @@
308 +-------------------------------------------------------------------------------------------------------------+
309 |:Upstream bug: :mysqlbug:`69146` - Optimization in buf_pool_get_oldest_modification if srv_buf_pool_instances|
310 |:Launchpad bug: :bug:`1176496` |
311+<<<<<<< TREE
312 |:Upstream state: Verified (checked on 2014-07-01) |
313+=======
314+|:Upstream state: Verified (checked on 2014-05-29) |
315+>>>>>>> MERGE-SOURCE
316 |:Fix Released: :rn:`5.5.8-20.0` |
317 |:Upstream fix: N/A |
318 +-------------------------------------------------------------------------------------------------------------+
319
320=== modified file 'man/comp_err.1'
321--- man/comp_err.1 2014-06-03 13:14:25 +0000
322+++ man/comp_err.1 2014-07-30 19:40:33 +0000
323@@ -2,12 +2,20 @@
324 .\" Title: \fBcomp_err\fR
325 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
326 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
327+<<<<<<< TREE
328 .\" Date: 05/11/2014
329+=======
330+.\" Date: 03/14/2014
331+>>>>>>> MERGE-SOURCE
332 .\" Manual: MySQL Database System
333 .\" Source: MySQL 5.5
334 .\" Language: English
335 .\"
336+<<<<<<< TREE
337 .TH "\FBCOMP_ERR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
338+=======
339+.TH "\FBCOMP_ERR\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
340+>>>>>>> MERGE-SOURCE
341 .\" -----------------------------------------------------------------
342 .\" * Define some portability stuff
343 .\" -----------------------------------------------------------------
344
345=== modified file 'man/innochecksum.1'
346--- man/innochecksum.1 2014-06-03 13:14:25 +0000
347+++ man/innochecksum.1 2014-07-30 19:40:33 +0000
348@@ -2,12 +2,20 @@
349 .\" Title: \fBinnochecksum\fR
350 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
351 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
352+<<<<<<< TREE
353 .\" Date: 05/11/2014
354+=======
355+.\" Date: 03/14/2014
356+>>>>>>> MERGE-SOURCE
357 .\" Manual: MySQL Database System
358 .\" Source: MySQL 5.5
359 .\" Language: English
360 .\"
361+<<<<<<< TREE
362 .TH "\FBINNOCHECKSUM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
363+=======
364+.TH "\FBINNOCHECKSUM\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
365+>>>>>>> MERGE-SOURCE
366 .\" -----------------------------------------------------------------
367 .\" * Define some portability stuff
368 .\" -----------------------------------------------------------------
369
370=== modified file 'man/msql2mysql.1'
371--- man/msql2mysql.1 2014-06-03 13:14:25 +0000
372+++ man/msql2mysql.1 2014-07-30 19:40:33 +0000
373@@ -2,12 +2,20 @@
374 .\" Title: \fBmsql2mysql\fR
375 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
376 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
377+<<<<<<< TREE
378 .\" Date: 05/11/2014
379+=======
380+.\" Date: 03/14/2014
381+>>>>>>> MERGE-SOURCE
382 .\" Manual: MySQL Database System
383 .\" Source: MySQL 5.5
384 .\" Language: English
385 .\"
386+<<<<<<< TREE
387 .TH "\FBMSQL2MYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
388+=======
389+.TH "\FBMSQL2MYSQL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
390+>>>>>>> MERGE-SOURCE
391 .\" -----------------------------------------------------------------
392 .\" * Define some portability stuff
393 .\" -----------------------------------------------------------------
394
395=== modified file 'man/my_print_defaults.1'
396--- man/my_print_defaults.1 2014-06-03 13:14:25 +0000
397+++ man/my_print_defaults.1 2014-07-30 19:40:33 +0000
398@@ -2,12 +2,20 @@
399 .\" Title: \fBmy_print_defaults\fR
400 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
401 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
402+<<<<<<< TREE
403 .\" Date: 05/11/2014
404+=======
405+.\" Date: 03/14/2014
406+>>>>>>> MERGE-SOURCE
407 .\" Manual: MySQL Database System
408 .\" Source: MySQL 5.5
409 .\" Language: English
410 .\"
411+<<<<<<< TREE
412 .TH "\FBMY_PRINT_DEFAULTS" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
413+=======
414+.TH "\FBMY_PRINT_DEFAULTS" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
415+>>>>>>> MERGE-SOURCE
416 .\" -----------------------------------------------------------------
417 .\" * Define some portability stuff
418 .\" -----------------------------------------------------------------
419
420=== modified file 'man/myisam_ftdump.1'
421--- man/myisam_ftdump.1 2014-06-03 13:14:25 +0000
422+++ man/myisam_ftdump.1 2014-07-30 19:40:33 +0000
423@@ -2,12 +2,20 @@
424 .\" Title: \fBmyisam_ftdump\fR
425 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
426 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
427+<<<<<<< TREE
428 .\" Date: 05/11/2014
429+=======
430+.\" Date: 03/14/2014
431+>>>>>>> MERGE-SOURCE
432 .\" Manual: MySQL Database System
433 .\" Source: MySQL 5.5
434 .\" Language: English
435 .\"
436+<<<<<<< TREE
437 .TH "\FBMYISAM_FTDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
438+=======
439+.TH "\FBMYISAM_FTDUMP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
440+>>>>>>> MERGE-SOURCE
441 .\" -----------------------------------------------------------------
442 .\" * Define some portability stuff
443 .\" -----------------------------------------------------------------
444
445=== modified file 'man/myisamchk.1'
446--- man/myisamchk.1 2014-06-03 13:14:25 +0000
447+++ man/myisamchk.1 2014-07-30 19:40:33 +0000
448@@ -2,12 +2,20 @@
449 .\" Title: \fBmyisamchk\fR
450 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
451 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
452+<<<<<<< TREE
453 .\" Date: 05/11/2014
454+=======
455+.\" Date: 03/14/2014
456+>>>>>>> MERGE-SOURCE
457 .\" Manual: MySQL Database System
458 .\" Source: MySQL 5.5
459 .\" Language: English
460 .\"
461+<<<<<<< TREE
462 .TH "\FBMYISAMCHK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
463+=======
464+.TH "\FBMYISAMCHK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
465+>>>>>>> MERGE-SOURCE
466 .\" -----------------------------------------------------------------
467 .\" * Define some portability stuff
468 .\" -----------------------------------------------------------------
469@@ -306,6 +314,7 @@
470 Write a debugging log\&. A typical
471 \fIdebug_options\fR
472 string is
473+<<<<<<< TREE
474 d:t:o,\fIfile_name\fR\&. The default is
475 d:t:o,/tmp/myisamchk\&.trace\&.
476 .RE
477@@ -400,6 +409,10 @@
478 \fB\-\-print\-defaults\fR
479 .sp
480 Print the program name and all options that it gets from option files\&.
481+=======
482+d:t:o,\fIfile_name\fR\&. The default is
483+d:t:o,/tmp/myisamchk\&.trace\&.
484+>>>>>>> MERGE-SOURCE
485 .RE
486 .sp
487 .RS 4
488
489=== modified file 'man/myisamlog.1'
490--- man/myisamlog.1 2014-06-03 13:14:25 +0000
491+++ man/myisamlog.1 2014-07-30 19:40:33 +0000
492@@ -2,12 +2,20 @@
493 .\" Title: \fBmyisamlog\fR
494 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
495 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
496+<<<<<<< TREE
497 .\" Date: 05/11/2014
498+=======
499+.\" Date: 03/14/2014
500+>>>>>>> MERGE-SOURCE
501 .\" Manual: MySQL Database System
502 .\" Source: MySQL 5.5
503 .\" Language: English
504 .\"
505+<<<<<<< TREE
506 .TH "\FBMYISAMLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
507+=======
508+.TH "\FBMYISAMLOG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
509+>>>>>>> MERGE-SOURCE
510 .\" -----------------------------------------------------------------
511 .\" * Define some portability stuff
512 .\" -----------------------------------------------------------------
513
514=== modified file 'man/myisampack.1'
515--- man/myisampack.1 2014-06-03 13:14:25 +0000
516+++ man/myisampack.1 2014-07-30 19:40:33 +0000
517@@ -2,12 +2,20 @@
518 .\" Title: \fBmyisampack\fR
519 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
520 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
521+<<<<<<< TREE
522 .\" Date: 05/11/2014
523+=======
524+.\" Date: 03/14/2014
525+>>>>>>> MERGE-SOURCE
526 .\" Manual: MySQL Database System
527 .\" Source: MySQL 5.5
528 .\" Language: English
529 .\"
530+<<<<<<< TREE
531 .TH "\FBMYISAMPACK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
532+=======
533+.TH "\FBMYISAMPACK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
534+>>>>>>> MERGE-SOURCE
535 .\" -----------------------------------------------------------------
536 .\" * Define some portability stuff
537 .\" -----------------------------------------------------------------
538
539=== modified file 'man/mysql-stress-test.pl.1'
540--- man/mysql-stress-test.pl.1 2014-06-03 13:14:25 +0000
541+++ man/mysql-stress-test.pl.1 2014-07-30 19:40:33 +0000
542@@ -2,12 +2,20 @@
543 .\" Title: \fBmysql-stress-test.pl\fR
544 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
545 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
546+<<<<<<< TREE
547 .\" Date: 05/06/2014
548+=======
549+.\" Date: 03/10/2014
550+>>>>>>> MERGE-SOURCE
551 .\" Manual: MySQL Database System
552 .\" Source: MySQL
553 .\" Language: English
554 .\"
555+<<<<<<< TREE
556 .TH "\FBMYSQL\-STRESS\-TE" "1" "05/06/2014" "MySQL" "MySQL Database System"
557+=======
558+.TH "\FBMYSQL\-STRESS\-TE" "1" "03/10/2014" "MySQL" "MySQL Database System"
559+>>>>>>> MERGE-SOURCE
560 .\" -----------------------------------------------------------------
561 .\" * Define some portability stuff
562 .\" -----------------------------------------------------------------
563
564=== modified file 'man/mysql-test-run.pl.1'
565--- man/mysql-test-run.pl.1 2014-06-03 13:14:25 +0000
566+++ man/mysql-test-run.pl.1 2014-07-30 19:40:33 +0000
567@@ -2,12 +2,20 @@
568 .\" Title: \fBmysql-test-run.pl\fR
569 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
570 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
571+<<<<<<< TREE
572 .\" Date: 05/06/2014
573+=======
574+.\" Date: 03/10/2014
575+>>>>>>> MERGE-SOURCE
576 .\" Manual: MySQL Database System
577 .\" Source: MySQL
578 .\" Language: English
579 .\"
580+<<<<<<< TREE
581 .TH "\FBMYSQL\-TEST\-RUN\" "1" "05/06/2014" "MySQL" "MySQL Database System"
582+=======
583+.TH "\FBMYSQL\-TEST\-RUN\" "1" "03/10/2014" "MySQL" "MySQL Database System"
584+>>>>>>> MERGE-SOURCE
585 .\" -----------------------------------------------------------------
586 .\" * Define some portability stuff
587 .\" -----------------------------------------------------------------
588
589=== modified file 'man/mysql.1'
590--- man/mysql.1 2014-06-03 13:14:25 +0000
591+++ man/mysql.1 2014-07-30 19:40:33 +0000
592@@ -2,12 +2,20 @@
593 .\" Title: \fBmysql\fR
594 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
595 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
596+<<<<<<< TREE
597 .\" Date: 05/11/2014
598+=======
599+.\" Date: 03/14/2014
600+>>>>>>> MERGE-SOURCE
601 .\" Manual: MySQL Database System
602 .\" Source: MySQL 5.5
603 .\" Language: English
604 .\"
605+<<<<<<< TREE
606 .TH "\FBMYSQL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
607+=======
608+.TH "\FBMYSQL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
609+>>>>>>> MERGE-SOURCE
610 .\" -----------------------------------------------------------------
611 .\" * Define some portability stuff
612 .\" -----------------------------------------------------------------
613
614=== modified file 'man/mysql.server.1'
615--- man/mysql.server.1 2014-06-03 13:14:25 +0000
616+++ man/mysql.server.1 2014-07-30 19:40:33 +0000
617@@ -2,12 +2,20 @@
618 .\" Title: \fBmysql.server\fR
619 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
620 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
621+<<<<<<< TREE
622 .\" Date: 05/11/2014
623+=======
624+.\" Date: 03/14/2014
625+>>>>>>> MERGE-SOURCE
626 .\" Manual: MySQL Database System
627 .\" Source: MySQL 5.5
628 .\" Language: English
629 .\"
630+<<<<<<< TREE
631 .TH "\FBMYSQL\&.SERVER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
632+=======
633+.TH "\FBMYSQL\&.SERVER\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
634+>>>>>>> MERGE-SOURCE
635 .\" -----------------------------------------------------------------
636 .\" * Define some portability stuff
637 .\" -----------------------------------------------------------------
638
639=== modified file 'man/mysql_client_test.1'
640--- man/mysql_client_test.1 2014-06-03 13:14:25 +0000
641+++ man/mysql_client_test.1 2014-07-30 19:40:33 +0000
642@@ -2,12 +2,20 @@
643 .\" Title: \fBmysql_client_test\fR
644 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
645 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
646+<<<<<<< TREE
647 .\" Date: 05/06/2014
648+=======
649+.\" Date: 03/10/2014
650+>>>>>>> MERGE-SOURCE
651 .\" Manual: MySQL Database System
652 .\" Source: MySQL
653 .\" Language: English
654 .\"
655+<<<<<<< TREE
656 .TH "\FBMYSQL_CLIENT_TEST" "1" "05/06/2014" "MySQL" "MySQL Database System"
657+=======
658+.TH "\FBMYSQL_CLIENT_TEST" "1" "03/10/2014" "MySQL" "MySQL Database System"
659+>>>>>>> MERGE-SOURCE
660 .\" -----------------------------------------------------------------
661 .\" * Define some portability stuff
662 .\" -----------------------------------------------------------------
663
664=== modified file 'man/mysql_config.1'
665--- man/mysql_config.1 2014-06-03 13:14:25 +0000
666+++ man/mysql_config.1 2014-07-30 19:40:33 +0000
667@@ -2,12 +2,20 @@
668 .\" Title: \fBmysql_config\fR
669 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
670 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
671+<<<<<<< TREE
672 .\" Date: 05/11/2014
673+=======
674+.\" Date: 03/14/2014
675+>>>>>>> MERGE-SOURCE
676 .\" Manual: MySQL Database System
677 .\" Source: MySQL 5.5
678 .\" Language: English
679 .\"
680+<<<<<<< TREE
681 .TH "\FBMYSQL_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
682+=======
683+.TH "\FBMYSQL_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
684+>>>>>>> MERGE-SOURCE
685 .\" -----------------------------------------------------------------
686 .\" * Define some portability stuff
687 .\" -----------------------------------------------------------------
688
689=== modified file 'man/mysql_convert_table_format.1'
690--- man/mysql_convert_table_format.1 2014-06-03 13:14:25 +0000
691+++ man/mysql_convert_table_format.1 2014-07-30 19:40:33 +0000
692@@ -2,12 +2,20 @@
693 .\" Title: \fBmysql_convert_table_format\fR
694 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
695 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
696+<<<<<<< TREE
697 .\" Date: 05/11/2014
698+=======
699+.\" Date: 03/14/2014
700+>>>>>>> MERGE-SOURCE
701 .\" Manual: MySQL Database System
702 .\" Source: MySQL 5.5
703 .\" Language: English
704 .\"
705+<<<<<<< TREE
706 .TH "\FBMYSQL_CONVERT_TAB" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
707+=======
708+.TH "\FBMYSQL_CONVERT_TAB" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
709+>>>>>>> MERGE-SOURCE
710 .\" -----------------------------------------------------------------
711 .\" * Define some portability stuff
712 .\" -----------------------------------------------------------------
713
714=== modified file 'man/mysql_find_rows.1'
715--- man/mysql_find_rows.1 2014-06-03 13:14:25 +0000
716+++ man/mysql_find_rows.1 2014-07-30 19:40:33 +0000
717@@ -2,12 +2,20 @@
718 .\" Title: \fBmysql_find_rows\fR
719 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
720 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
721+<<<<<<< TREE
722 .\" Date: 05/11/2014
723+=======
724+.\" Date: 03/14/2014
725+>>>>>>> MERGE-SOURCE
726 .\" Manual: MySQL Database System
727 .\" Source: MySQL 5.5
728 .\" Language: English
729 .\"
730+<<<<<<< TREE
731 .TH "\FBMYSQL_FIND_ROWS\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
732+=======
733+.TH "\FBMYSQL_FIND_ROWS\F" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
734+>>>>>>> MERGE-SOURCE
735 .\" -----------------------------------------------------------------
736 .\" * Define some portability stuff
737 .\" -----------------------------------------------------------------
738
739=== modified file 'man/mysql_fix_extensions.1'
740--- man/mysql_fix_extensions.1 2014-06-03 13:14:25 +0000
741+++ man/mysql_fix_extensions.1 2014-07-30 19:40:33 +0000
742@@ -2,12 +2,20 @@
743 .\" Title: \fBmysql_fix_extensions\fR
744 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
745 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
746+<<<<<<< TREE
747 .\" Date: 05/11/2014
748+=======
749+.\" Date: 03/14/2014
750+>>>>>>> MERGE-SOURCE
751 .\" Manual: MySQL Database System
752 .\" Source: MySQL 5.5
753 .\" Language: English
754 .\"
755+<<<<<<< TREE
756 .TH "\FBMYSQL_FIX_EXTENSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
757+=======
758+.TH "\FBMYSQL_FIX_EXTENSI" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
759+>>>>>>> MERGE-SOURCE
760 .\" -----------------------------------------------------------------
761 .\" * Define some portability stuff
762 .\" -----------------------------------------------------------------
763
764=== modified file 'man/mysql_install_db.1'
765--- man/mysql_install_db.1 2014-06-03 13:14:25 +0000
766+++ man/mysql_install_db.1 2014-07-30 19:40:33 +0000
767@@ -2,12 +2,20 @@
768 .\" Title: \fBmysql_install_db\fR
769 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
770 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
771+<<<<<<< TREE
772 .\" Date: 05/11/2014
773+=======
774+.\" Date: 03/14/2014
775+>>>>>>> MERGE-SOURCE
776 .\" Manual: MySQL Database System
777 .\" Source: MySQL 5.5
778 .\" Language: English
779 .\"
780+<<<<<<< TREE
781 .TH "\FBMYSQL_INSTALL_DB\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
782+=======
783+.TH "\FBMYSQL_INSTALL_DB\" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
784+>>>>>>> MERGE-SOURCE
785 .\" -----------------------------------------------------------------
786 .\" * Define some portability stuff
787 .\" -----------------------------------------------------------------
788
789=== modified file 'man/mysql_plugin.1'
790--- man/mysql_plugin.1 2014-06-03 13:14:25 +0000
791+++ man/mysql_plugin.1 2014-07-30 19:40:33 +0000
792@@ -2,12 +2,20 @@
793 .\" Title: \fBmysql_plugin\fR
794 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
795 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
796+<<<<<<< TREE
797 .\" Date: 05/11/2014
798+=======
799+.\" Date: 03/14/2014
800+>>>>>>> MERGE-SOURCE
801 .\" Manual: MySQL Database System
802 .\" Source: MySQL 5.5
803 .\" Language: English
804 .\"
805+<<<<<<< TREE
806 .TH "\FBMYSQL_PLUGIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
807+=======
808+.TH "\FBMYSQL_PLUGIN\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
809+>>>>>>> MERGE-SOURCE
810 .\" -----------------------------------------------------------------
811 .\" * Define some portability stuff
812 .\" -----------------------------------------------------------------
813
814=== modified file 'man/mysql_secure_installation.1'
815--- man/mysql_secure_installation.1 2014-06-03 13:14:25 +0000
816+++ man/mysql_secure_installation.1 2014-07-30 19:40:33 +0000
817@@ -2,12 +2,20 @@
818 .\" Title: \fBmysql_secure_installation\fR
819 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
820 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
821+<<<<<<< TREE
822 .\" Date: 05/11/2014
823+=======
824+.\" Date: 03/14/2014
825+>>>>>>> MERGE-SOURCE
826 .\" Manual: MySQL Database System
827 .\" Source: MySQL 5.5
828 .\" Language: English
829 .\"
830+<<<<<<< TREE
831 .TH "\FBMYSQL_SECURE_INST" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
832+=======
833+.TH "\FBMYSQL_SECURE_INST" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
834+>>>>>>> MERGE-SOURCE
835 .\" -----------------------------------------------------------------
836 .\" * Define some portability stuff
837 .\" -----------------------------------------------------------------
838
839=== modified file 'man/mysql_setpermission.1'
840--- man/mysql_setpermission.1 2014-06-03 13:14:25 +0000
841+++ man/mysql_setpermission.1 2014-07-30 19:40:33 +0000
842@@ -2,12 +2,20 @@
843 .\" Title: \fBmysql_setpermission\fR
844 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
845 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
846+<<<<<<< TREE
847 .\" Date: 05/11/2014
848+=======
849+.\" Date: 03/14/2014
850+>>>>>>> MERGE-SOURCE
851 .\" Manual: MySQL Database System
852 .\" Source: MySQL 5.5
853 .\" Language: English
854 .\"
855+<<<<<<< TREE
856 .TH "\FBMYSQL_SETPERMISSI" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
857+=======
858+.TH "\FBMYSQL_SETPERMISSI" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
859+>>>>>>> MERGE-SOURCE
860 .\" -----------------------------------------------------------------
861 .\" * Define some portability stuff
862 .\" -----------------------------------------------------------------
863
864=== modified file 'man/mysql_tzinfo_to_sql.1'
865--- man/mysql_tzinfo_to_sql.1 2014-06-03 13:14:25 +0000
866+++ man/mysql_tzinfo_to_sql.1 2014-07-30 19:40:33 +0000
867@@ -2,12 +2,20 @@
868 .\" Title: \fBmysql_tzinfo_to_sql\fR
869 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
870 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
871+<<<<<<< TREE
872 .\" Date: 05/11/2014
873+=======
874+.\" Date: 03/14/2014
875+>>>>>>> MERGE-SOURCE
876 .\" Manual: MySQL Database System
877 .\" Source: MySQL 5.5
878 .\" Language: English
879 .\"
880+<<<<<<< TREE
881 .TH "\FBMYSQL_TZINFO_TO_S" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
882+=======
883+.TH "\FBMYSQL_TZINFO_TO_S" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
884+>>>>>>> MERGE-SOURCE
885 .\" -----------------------------------------------------------------
886 .\" * Define some portability stuff
887 .\" -----------------------------------------------------------------
888
889=== modified file 'man/mysql_upgrade.1'
890--- man/mysql_upgrade.1 2014-06-03 13:14:25 +0000
891+++ man/mysql_upgrade.1 2014-07-30 19:40:33 +0000
892@@ -2,12 +2,20 @@
893 .\" Title: \fBmysql_upgrade\fR
894 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
895 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
896+<<<<<<< TREE
897 .\" Date: 05/11/2014
898+=======
899+.\" Date: 03/14/2014
900+>>>>>>> MERGE-SOURCE
901 .\" Manual: MySQL Database System
902 .\" Source: MySQL 5.5
903 .\" Language: English
904 .\"
905+<<<<<<< TREE
906 .TH "\FBMYSQL_UPGRADE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
907+=======
908+.TH "\FBMYSQL_UPGRADE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
909+>>>>>>> MERGE-SOURCE
910 .\" -----------------------------------------------------------------
911 .\" * Define some portability stuff
912 .\" -----------------------------------------------------------------
913
914=== modified file 'man/mysql_waitpid.1'
915--- man/mysql_waitpid.1 2014-06-03 13:14:25 +0000
916+++ man/mysql_waitpid.1 2014-07-30 19:40:33 +0000
917@@ -2,12 +2,20 @@
918 .\" Title: \fBmysql_waitpid\fR
919 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
920 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
921+<<<<<<< TREE
922 .\" Date: 05/11/2014
923+=======
924+.\" Date: 03/14/2014
925+>>>>>>> MERGE-SOURCE
926 .\" Manual: MySQL Database System
927 .\" Source: MySQL 5.5
928 .\" Language: English
929 .\"
930+<<<<<<< TREE
931 .TH "\FBMYSQL_WAITPID\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
932+=======
933+.TH "\FBMYSQL_WAITPID\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
934+>>>>>>> MERGE-SOURCE
935 .\" -----------------------------------------------------------------
936 .\" * Define some portability stuff
937 .\" -----------------------------------------------------------------
938
939=== modified file 'man/mysql_zap.1'
940--- man/mysql_zap.1 2014-06-03 13:14:25 +0000
941+++ man/mysql_zap.1 2014-07-30 19:40:33 +0000
942@@ -2,12 +2,20 @@
943 .\" Title: \fBmysql_zap\fR
944 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
945 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
946+<<<<<<< TREE
947 .\" Date: 05/11/2014
948+=======
949+.\" Date: 03/14/2014
950+>>>>>>> MERGE-SOURCE
951 .\" Manual: MySQL Database System
952 .\" Source: MySQL 5.5
953 .\" Language: English
954 .\"
955+<<<<<<< TREE
956 .TH "\FBMYSQL_ZAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
957+=======
958+.TH "\FBMYSQL_ZAP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
959+>>>>>>> MERGE-SOURCE
960 .\" -----------------------------------------------------------------
961 .\" * Define some portability stuff
962 .\" -----------------------------------------------------------------
963
964=== modified file 'man/mysqlaccess.1'
965--- man/mysqlaccess.1 2014-06-03 13:14:25 +0000
966+++ man/mysqlaccess.1 2014-07-30 19:40:33 +0000
967@@ -2,12 +2,20 @@
968 .\" Title: \fBmysqlaccess\fR
969 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
970 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
971+<<<<<<< TREE
972 .\" Date: 05/11/2014
973+=======
974+.\" Date: 03/14/2014
975+>>>>>>> MERGE-SOURCE
976 .\" Manual: MySQL Database System
977 .\" Source: MySQL 5.5
978 .\" Language: English
979 .\"
980+<<<<<<< TREE
981 .TH "\FBMYSQLACCESS\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
982+=======
983+.TH "\FBMYSQLACCESS\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
984+>>>>>>> MERGE-SOURCE
985 .\" -----------------------------------------------------------------
986 .\" * Define some portability stuff
987 .\" -----------------------------------------------------------------
988
989=== modified file 'man/mysqladmin.1'
990--- man/mysqladmin.1 2014-06-03 13:14:25 +0000
991+++ man/mysqladmin.1 2014-07-30 19:40:33 +0000
992@@ -2,12 +2,20 @@
993 .\" Title: \fBmysqladmin\fR
994 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
995 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
996+<<<<<<< TREE
997 .\" Date: 05/11/2014
998+=======
999+.\" Date: 03/14/2014
1000+>>>>>>> MERGE-SOURCE
1001 .\" Manual: MySQL Database System
1002 .\" Source: MySQL 5.5
1003 .\" Language: English
1004 .\"
1005+<<<<<<< TREE
1006 .TH "\FBMYSQLADMIN\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1007+=======
1008+.TH "\FBMYSQLADMIN\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1009+>>>>>>> MERGE-SOURCE
1010 .\" -----------------------------------------------------------------
1011 .\" * Define some portability stuff
1012 .\" -----------------------------------------------------------------
1013
1014=== modified file 'man/mysqlbinlog.1'
1015--- man/mysqlbinlog.1 2014-06-03 13:14:25 +0000
1016+++ man/mysqlbinlog.1 2014-07-30 19:40:33 +0000
1017@@ -2,12 +2,20 @@
1018 .\" Title: \fBmysqlbinlog\fR
1019 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1020 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1021+<<<<<<< TREE
1022 .\" Date: 05/11/2014
1023+=======
1024+.\" Date: 03/14/2014
1025+>>>>>>> MERGE-SOURCE
1026 .\" Manual: MySQL Database System
1027 .\" Source: MySQL 5.5
1028 .\" Language: English
1029 .\"
1030+<<<<<<< TREE
1031 .TH "\FBMYSQLBINLOG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1032+=======
1033+.TH "\FBMYSQLBINLOG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1034+>>>>>>> MERGE-SOURCE
1035 .\" -----------------------------------------------------------------
1036 .\" * Define some portability stuff
1037 .\" -----------------------------------------------------------------
1038
1039=== modified file 'man/mysqlbug.1'
1040--- man/mysqlbug.1 2014-06-03 13:14:25 +0000
1041+++ man/mysqlbug.1 2014-07-30 19:40:33 +0000
1042@@ -2,12 +2,20 @@
1043 .\" Title: \fBmysqlbug\fR
1044 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1045 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1046+<<<<<<< TREE
1047 .\" Date: 05/11/2014
1048+=======
1049+.\" Date: 03/14/2014
1050+>>>>>>> MERGE-SOURCE
1051 .\" Manual: MySQL Database System
1052 .\" Source: MySQL 5.5
1053 .\" Language: English
1054 .\"
1055+<<<<<<< TREE
1056 .TH "\FBMYSQLBUG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1057+=======
1058+.TH "\FBMYSQLBUG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1059+>>>>>>> MERGE-SOURCE
1060 .\" -----------------------------------------------------------------
1061 .\" * Define some portability stuff
1062 .\" -----------------------------------------------------------------
1063
1064=== modified file 'man/mysqlcheck.1'
1065--- man/mysqlcheck.1 2014-06-03 13:14:25 +0000
1066+++ man/mysqlcheck.1 2014-07-30 19:40:33 +0000
1067@@ -2,12 +2,20 @@
1068 .\" Title: \fBmysqlcheck\fR
1069 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1070 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1071+<<<<<<< TREE
1072 .\" Date: 05/11/2014
1073+=======
1074+.\" Date: 03/14/2014
1075+>>>>>>> MERGE-SOURCE
1076 .\" Manual: MySQL Database System
1077 .\" Source: MySQL 5.5
1078 .\" Language: English
1079 .\"
1080+<<<<<<< TREE
1081 .TH "\FBMYSQLCHECK\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1082+=======
1083+.TH "\FBMYSQLCHECK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1084+>>>>>>> MERGE-SOURCE
1085 .\" -----------------------------------------------------------------
1086 .\" * Define some portability stuff
1087 .\" -----------------------------------------------------------------
1088
1089=== modified file 'man/mysqld.8'
1090--- man/mysqld.8 2014-06-03 13:14:25 +0000
1091+++ man/mysqld.8 2014-07-30 19:40:33 +0000
1092@@ -2,12 +2,20 @@
1093 .\" Title: \fBmysqld\fR
1094 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1095 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1096+<<<<<<< TREE
1097 .\" Date: 05/11/2014
1098+=======
1099+.\" Date: 03/14/2014
1100+>>>>>>> MERGE-SOURCE
1101 .\" Manual: MySQL Database System
1102 .\" Source: MySQL 5.5
1103 .\" Language: English
1104 .\"
1105+<<<<<<< TREE
1106 .TH "\FBMYSQLD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1107+=======
1108+.TH "\FBMYSQLD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1109+>>>>>>> MERGE-SOURCE
1110 .\" -----------------------------------------------------------------
1111 .\" * Define some portability stuff
1112 .\" -----------------------------------------------------------------
1113
1114=== modified file 'man/mysqld_multi.1'
1115--- man/mysqld_multi.1 2014-06-03 13:14:25 +0000
1116+++ man/mysqld_multi.1 2014-07-30 19:40:33 +0000
1117@@ -2,12 +2,20 @@
1118 .\" Title: \fBmysqld_multi\fR
1119 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1120 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1121+<<<<<<< TREE
1122 .\" Date: 05/11/2014
1123+=======
1124+.\" Date: 03/14/2014
1125+>>>>>>> MERGE-SOURCE
1126 .\" Manual: MySQL Database System
1127 .\" Source: MySQL 5.5
1128 .\" Language: English
1129 .\"
1130+<<<<<<< TREE
1131 .TH "\FBMYSQLD_MULTI\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1132+=======
1133+.TH "\FBMYSQLD_MULTI\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1134+>>>>>>> MERGE-SOURCE
1135 .\" -----------------------------------------------------------------
1136 .\" * Define some portability stuff
1137 .\" -----------------------------------------------------------------
1138
1139=== modified file 'man/mysqld_safe.1'
1140--- man/mysqld_safe.1 2014-06-03 13:14:25 +0000
1141+++ man/mysqld_safe.1 2014-07-30 19:40:33 +0000
1142@@ -2,12 +2,20 @@
1143 .\" Title: \fBmysqld_safe\fR
1144 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1145 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1146+<<<<<<< TREE
1147 .\" Date: 05/11/2014
1148+=======
1149+.\" Date: 03/14/2014
1150+>>>>>>> MERGE-SOURCE
1151 .\" Manual: MySQL Database System
1152 .\" Source: MySQL 5.5
1153 .\" Language: English
1154 .\"
1155+<<<<<<< TREE
1156 .TH "\FBMYSQLD_SAFE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1157+=======
1158+.TH "\FBMYSQLD_SAFE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1159+>>>>>>> MERGE-SOURCE
1160 .\" -----------------------------------------------------------------
1161 .\" * Define some portability stuff
1162 .\" -----------------------------------------------------------------
1163
1164=== modified file 'man/mysqldump.1'
1165--- man/mysqldump.1 2014-06-03 13:14:25 +0000
1166+++ man/mysqldump.1 2014-07-30 19:40:33 +0000
1167@@ -2,12 +2,20 @@
1168 .\" Title: \fBmysqldump\fR
1169 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1170 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1171+<<<<<<< TREE
1172 .\" Date: 05/11/2014
1173+=======
1174+.\" Date: 03/14/2014
1175+>>>>>>> MERGE-SOURCE
1176 .\" Manual: MySQL Database System
1177 .\" Source: MySQL 5.5
1178 .\" Language: English
1179 .\"
1180+<<<<<<< TREE
1181 .TH "\FBMYSQLDUMP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1182+=======
1183+.TH "\FBMYSQLDUMP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1184+>>>>>>> MERGE-SOURCE
1185 .\" -----------------------------------------------------------------
1186 .\" * Define some portability stuff
1187 .\" -----------------------------------------------------------------
1188
1189=== modified file 'man/mysqldumpslow.1'
1190--- man/mysqldumpslow.1 2014-06-03 13:14:25 +0000
1191+++ man/mysqldumpslow.1 2014-07-30 19:40:33 +0000
1192@@ -2,12 +2,20 @@
1193 .\" Title: \fBmysqldumpslow\fR
1194 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1195 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1196+<<<<<<< TREE
1197 .\" Date: 05/11/2014
1198+=======
1199+.\" Date: 03/14/2014
1200+>>>>>>> MERGE-SOURCE
1201 .\" Manual: MySQL Database System
1202 .\" Source: MySQL 5.5
1203 .\" Language: English
1204 .\"
1205+<<<<<<< TREE
1206 .TH "\FBMYSQLDUMPSLOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1207+=======
1208+.TH "\FBMYSQLDUMPSLOW\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1209+>>>>>>> MERGE-SOURCE
1210 .\" -----------------------------------------------------------------
1211 .\" * Define some portability stuff
1212 .\" -----------------------------------------------------------------
1213
1214=== modified file 'man/mysqlhotcopy.1'
1215--- man/mysqlhotcopy.1 2014-06-03 13:14:25 +0000
1216+++ man/mysqlhotcopy.1 2014-07-30 19:40:33 +0000
1217@@ -2,12 +2,20 @@
1218 .\" Title: \fBmysqlhotcopy\fR
1219 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1220 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1221+<<<<<<< TREE
1222 .\" Date: 05/11/2014
1223+=======
1224+.\" Date: 03/14/2014
1225+>>>>>>> MERGE-SOURCE
1226 .\" Manual: MySQL Database System
1227 .\" Source: MySQL 5.5
1228 .\" Language: English
1229 .\"
1230+<<<<<<< TREE
1231 .TH "\FBMYSQLHOTCOPY\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1232+=======
1233+.TH "\FBMYSQLHOTCOPY\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1234+>>>>>>> MERGE-SOURCE
1235 .\" -----------------------------------------------------------------
1236 .\" * Define some portability stuff
1237 .\" -----------------------------------------------------------------
1238
1239=== modified file 'man/mysqlimport.1'
1240--- man/mysqlimport.1 2014-06-03 13:14:25 +0000
1241+++ man/mysqlimport.1 2014-07-30 19:40:33 +0000
1242@@ -2,12 +2,20 @@
1243 .\" Title: \fBmysqlimport\fR
1244 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1245 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1246+<<<<<<< TREE
1247 .\" Date: 05/11/2014
1248+=======
1249+.\" Date: 03/14/2014
1250+>>>>>>> MERGE-SOURCE
1251 .\" Manual: MySQL Database System
1252 .\" Source: MySQL 5.5
1253 .\" Language: English
1254 .\"
1255+<<<<<<< TREE
1256 .TH "\FBMYSQLIMPORT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1257+=======
1258+.TH "\FBMYSQLIMPORT\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1259+>>>>>>> MERGE-SOURCE
1260 .\" -----------------------------------------------------------------
1261 .\" * Define some portability stuff
1262 .\" -----------------------------------------------------------------
1263
1264=== modified file 'man/mysqlshow.1'
1265--- man/mysqlshow.1 2014-06-03 13:14:25 +0000
1266+++ man/mysqlshow.1 2014-07-30 19:40:33 +0000
1267@@ -2,12 +2,20 @@
1268 .\" Title: \fBmysqlshow\fR
1269 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1270 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1271+<<<<<<< TREE
1272 .\" Date: 05/11/2014
1273+=======
1274+.\" Date: 03/14/2014
1275+>>>>>>> MERGE-SOURCE
1276 .\" Manual: MySQL Database System
1277 .\" Source: MySQL 5.5
1278 .\" Language: English
1279 .\"
1280+<<<<<<< TREE
1281 .TH "\FBMYSQLSHOW\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1282+=======
1283+.TH "\FBMYSQLSHOW\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1284+>>>>>>> MERGE-SOURCE
1285 .\" -----------------------------------------------------------------
1286 .\" * Define some portability stuff
1287 .\" -----------------------------------------------------------------
1288
1289=== modified file 'man/mysqlslap.1'
1290--- man/mysqlslap.1 2014-06-03 13:14:25 +0000
1291+++ man/mysqlslap.1 2014-07-30 19:40:33 +0000
1292@@ -2,12 +2,20 @@
1293 .\" Title: \fBmysqlslap\fR
1294 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1295 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1296+<<<<<<< TREE
1297 .\" Date: 05/11/2014
1298+=======
1299+.\" Date: 03/14/2014
1300+>>>>>>> MERGE-SOURCE
1301 .\" Manual: MySQL Database System
1302 .\" Source: MySQL 5.5
1303 .\" Language: English
1304 .\"
1305+<<<<<<< TREE
1306 .TH "\FBMYSQLSLAP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1307+=======
1308+.TH "\FBMYSQLSLAP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1309+>>>>>>> MERGE-SOURCE
1310 .\" -----------------------------------------------------------------
1311 .\" * Define some portability stuff
1312 .\" -----------------------------------------------------------------
1313
1314=== modified file 'man/mysqltest.1'
1315--- man/mysqltest.1 2014-06-03 13:14:25 +0000
1316+++ man/mysqltest.1 2014-07-30 19:40:33 +0000
1317@@ -2,12 +2,20 @@
1318 .\" Title: \fBmysqltest\fR
1319 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1320 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1321+<<<<<<< TREE
1322 .\" Date: 05/06/2014
1323+=======
1324+.\" Date: 03/10/2014
1325+>>>>>>> MERGE-SOURCE
1326 .\" Manual: MySQL Database System
1327 .\" Source: MySQL
1328 .\" Language: English
1329 .\"
1330+<<<<<<< TREE
1331 .TH "\FBMYSQLTEST\FR" "1" "05/06/2014" "MySQL" "MySQL Database System"
1332+=======
1333+.TH "\FBMYSQLTEST\FR" "1" "03/10/2014" "MySQL" "MySQL Database System"
1334+>>>>>>> MERGE-SOURCE
1335 .\" -----------------------------------------------------------------
1336 .\" * Define some portability stuff
1337 .\" -----------------------------------------------------------------
1338
1339=== modified file 'man/ndb-common-options.1'
1340--- man/ndb-common-options.1 2014-06-03 13:14:25 +0000
1341+++ man/ndb-common-options.1 2014-07-30 19:40:33 +0000
1342@@ -2,12 +2,20 @@
1343 .\" Title: Options Common to MySQL Cluster Programs
1344 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1345 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1346+<<<<<<< TREE
1347 .\" Date: 05/11/2014
1348+=======
1349+.\" Date: 03/14/2014
1350+>>>>>>> MERGE-SOURCE
1351 .\" Manual: MySQL Database System
1352 .\" Source: MySQL 5.5
1353 .\" Language: English
1354 .\"
1355+<<<<<<< TREE
1356 .TH "OPTIONS COMMON TO MY" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1357+=======
1358+.TH "OPTIONS COMMON TO MY" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1359+>>>>>>> MERGE-SOURCE
1360 .\" -----------------------------------------------------------------
1361 .\" * Define some portability stuff
1362 .\" -----------------------------------------------------------------
1363
1364=== modified file 'man/ndb_blob_tool.1'
1365--- man/ndb_blob_tool.1 2014-06-03 13:14:25 +0000
1366+++ man/ndb_blob_tool.1 2014-07-30 19:40:33 +0000
1367@@ -2,12 +2,20 @@
1368 .\" Title: \fBndb_blob_tool\fR
1369 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1370 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1371+<<<<<<< TREE
1372 .\" Date: 05/11/2014
1373+=======
1374+.\" Date: 03/14/2014
1375+>>>>>>> MERGE-SOURCE
1376 .\" Manual: MySQL Database System
1377 .\" Source: MySQL 5.5
1378 .\" Language: English
1379 .\"
1380+<<<<<<< TREE
1381 .TH "\FBNDB_BLOB_TOOL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1382+=======
1383+.TH "\FBNDB_BLOB_TOOL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1384+>>>>>>> MERGE-SOURCE
1385 .\" -----------------------------------------------------------------
1386 .\" * Define some portability stuff
1387 .\" -----------------------------------------------------------------
1388
1389=== modified file 'man/ndb_config.1'
1390--- man/ndb_config.1 2014-06-03 13:14:25 +0000
1391+++ man/ndb_config.1 2014-07-30 19:40:33 +0000
1392@@ -2,12 +2,20 @@
1393 .\" Title: \fBndb_config\fR
1394 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1395 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1396+<<<<<<< TREE
1397 .\" Date: 05/11/2014
1398+=======
1399+.\" Date: 03/14/2014
1400+>>>>>>> MERGE-SOURCE
1401 .\" Manual: MySQL Database System
1402 .\" Source: MySQL 5.5
1403 .\" Language: English
1404 .\"
1405+<<<<<<< TREE
1406 .TH "\FBNDB_CONFIG\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1407+=======
1408+.TH "\FBNDB_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1409+>>>>>>> MERGE-SOURCE
1410 .\" -----------------------------------------------------------------
1411 .\" * Define some portability stuff
1412 .\" -----------------------------------------------------------------
1413@@ -1230,7 +1238,11 @@
1414 .\}
1415 .nf
1416 shell> \fBndb_config \-\-configinfo \-\-xml\fR
1417+<<<<<<< TREE
1418 <configvariables protocolversion="1" ndbversionstring="5\&.5\&.37\-ndb\-7\&.2\&.17"
1419+=======
1420+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.36\-ndb\-7\&.2\&.16"
1421+>>>>>>> MERGE-SOURCE
1422 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
1423 ndbversionbuild="6">
1424 <section name="SYSTEM">
1425
1426=== modified file 'man/ndb_cpcd.1'
1427--- man/ndb_cpcd.1 2014-06-03 13:14:25 +0000
1428+++ man/ndb_cpcd.1 2014-07-30 19:40:33 +0000
1429@@ -2,12 +2,20 @@
1430 .\" Title: \fBndb_cpcd\fR
1431 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1432 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1433+<<<<<<< TREE
1434 .\" Date: 05/11/2014
1435+=======
1436+.\" Date: 03/14/2014
1437+>>>>>>> MERGE-SOURCE
1438 .\" Manual: MySQL Database System
1439 .\" Source: MySQL 5.5
1440 .\" Language: English
1441 .\"
1442+<<<<<<< TREE
1443 .TH "\FBNDB_CPCD\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1444+=======
1445+.TH "\FBNDB_CPCD\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1446+>>>>>>> MERGE-SOURCE
1447 .\" -----------------------------------------------------------------
1448 .\" * Define some portability stuff
1449 .\" -----------------------------------------------------------------
1450
1451=== modified file 'man/ndb_delete_all.1'
1452--- man/ndb_delete_all.1 2014-06-03 13:14:25 +0000
1453+++ man/ndb_delete_all.1 2014-07-30 19:40:33 +0000
1454@@ -2,12 +2,20 @@
1455 .\" Title: \fBndb_delete_all\fR
1456 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1457 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1458+<<<<<<< TREE
1459 .\" Date: 05/11/2014
1460+=======
1461+.\" Date: 03/14/2014
1462+>>>>>>> MERGE-SOURCE
1463 .\" Manual: MySQL Database System
1464 .\" Source: MySQL 5.5
1465 .\" Language: English
1466 .\"
1467+<<<<<<< TREE
1468 .TH "\FBNDB_DELETE_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1469+=======
1470+.TH "\FBNDB_DELETE_ALL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1471+>>>>>>> MERGE-SOURCE
1472 .\" -----------------------------------------------------------------
1473 .\" * Define some portability stuff
1474 .\" -----------------------------------------------------------------
1475
1476=== modified file 'man/ndb_desc.1'
1477--- man/ndb_desc.1 2014-06-03 13:14:25 +0000
1478+++ man/ndb_desc.1 2014-07-30 19:40:33 +0000
1479@@ -2,12 +2,20 @@
1480 .\" Title: \fBndb_desc\fR
1481 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1482 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1483+<<<<<<< TREE
1484 .\" Date: 05/11/2014
1485+=======
1486+.\" Date: 03/14/2014
1487+>>>>>>> MERGE-SOURCE
1488 .\" Manual: MySQL Database System
1489 .\" Source: MySQL 5.5
1490 .\" Language: English
1491 .\"
1492+<<<<<<< TREE
1493 .TH "\FBNDB_DESC\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1494+=======
1495+.TH "\FBNDB_DESC\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1496+>>>>>>> MERGE-SOURCE
1497 .\" -----------------------------------------------------------------
1498 .\" * Define some portability stuff
1499 .\" -----------------------------------------------------------------
1500
1501=== modified file 'man/ndb_drop_index.1'
1502--- man/ndb_drop_index.1 2014-06-03 13:14:25 +0000
1503+++ man/ndb_drop_index.1 2014-07-30 19:40:33 +0000
1504@@ -2,12 +2,20 @@
1505 .\" Title: \fBndb_drop_index\fR
1506 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1507 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1508+<<<<<<< TREE
1509 .\" Date: 05/11/2014
1510+=======
1511+.\" Date: 03/14/2014
1512+>>>>>>> MERGE-SOURCE
1513 .\" Manual: MySQL Database System
1514 .\" Source: MySQL 5.5
1515 .\" Language: English
1516 .\"
1517+<<<<<<< TREE
1518 .TH "\FBNDB_DROP_INDEX\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1519+=======
1520+.TH "\FBNDB_DROP_INDEX\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1521+>>>>>>> MERGE-SOURCE
1522 .\" -----------------------------------------------------------------
1523 .\" * Define some portability stuff
1524 .\" -----------------------------------------------------------------
1525@@ -123,7 +131,11 @@
1526 Reading table information for completion of table and column names
1527 You can turn off this feature to get a quicker startup with \-A
1528 Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.
1529+<<<<<<< TREE
1530 Your MySQL connection id is 7 to server version: 5\&.5\&.37\-ndb\-7\&.2\&.17
1531+=======
1532+Your MySQL connection id is 7 to server version: 5\&.5\&.36\-ndb\-7\&.2\&.16
1533+>>>>>>> MERGE-SOURCE
1534 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
1535 mysql> \fBSHOW TABLES;\fR
1536 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
1537
1538=== modified file 'man/ndb_drop_table.1'
1539--- man/ndb_drop_table.1 2014-06-03 13:14:25 +0000
1540+++ man/ndb_drop_table.1 2014-07-30 19:40:33 +0000
1541@@ -2,12 +2,20 @@
1542 .\" Title: \fBndb_drop_table\fR
1543 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1544 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1545+<<<<<<< TREE
1546 .\" Date: 05/11/2014
1547+=======
1548+.\" Date: 03/14/2014
1549+>>>>>>> MERGE-SOURCE
1550 .\" Manual: MySQL Database System
1551 .\" Source: MySQL 5.5
1552 .\" Language: English
1553 .\"
1554+<<<<<<< TREE
1555 .TH "\FBNDB_DROP_TABLE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1556+=======
1557+.TH "\FBNDB_DROP_TABLE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1558+>>>>>>> MERGE-SOURCE
1559 .\" -----------------------------------------------------------------
1560 .\" * Define some portability stuff
1561 .\" -----------------------------------------------------------------
1562
1563=== modified file 'man/ndb_error_reporter.1'
1564--- man/ndb_error_reporter.1 2014-06-03 13:14:25 +0000
1565+++ man/ndb_error_reporter.1 2014-07-30 19:40:33 +0000
1566@@ -2,12 +2,20 @@
1567 .\" Title: \fBndb_error_reporter\fR
1568 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1569 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1570+<<<<<<< TREE
1571 .\" Date: 05/11/2014
1572+=======
1573+.\" Date: 03/14/2014
1574+>>>>>>> MERGE-SOURCE
1575 .\" Manual: MySQL Database System
1576 .\" Source: MySQL 5.5
1577 .\" Language: English
1578 .\"
1579+<<<<<<< TREE
1580 .TH "\FBNDB_ERROR_REPORTE" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1581+=======
1582+.TH "\FBNDB_ERROR_REPORTE" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1583+>>>>>>> MERGE-SOURCE
1584 .\" -----------------------------------------------------------------
1585 .\" * Define some portability stuff
1586 .\" -----------------------------------------------------------------
1587
1588=== modified file 'man/ndb_index_stat.1'
1589--- man/ndb_index_stat.1 2014-06-03 13:14:25 +0000
1590+++ man/ndb_index_stat.1 2014-07-30 19:40:33 +0000
1591@@ -2,12 +2,20 @@
1592 .\" Title: \fBndb_index_stat\fR
1593 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1594 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1595+<<<<<<< TREE
1596 .\" Date: 05/11/2014
1597+=======
1598+.\" Date: 03/14/2014
1599+>>>>>>> MERGE-SOURCE
1600 .\" Manual: MySQL Database System
1601 .\" Source: MySQL 5.5
1602 .\" Language: English
1603 .\"
1604+<<<<<<< TREE
1605 .TH "\FBNDB_INDEX_STAT\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1606+=======
1607+.TH "\FBNDB_INDEX_STAT\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1608+>>>>>>> MERGE-SOURCE
1609 .\" -----------------------------------------------------------------
1610 .\" * Define some portability stuff
1611 .\" -----------------------------------------------------------------
1612
1613=== modified file 'man/ndb_mgm.1'
1614--- man/ndb_mgm.1 2014-06-03 13:14:25 +0000
1615+++ man/ndb_mgm.1 2014-07-30 19:40:33 +0000
1616@@ -2,12 +2,20 @@
1617 .\" Title: \fBndb_mgm\fR
1618 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1619 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1620+<<<<<<< TREE
1621 .\" Date: 05/11/2014
1622+=======
1623+.\" Date: 03/14/2014
1624+>>>>>>> MERGE-SOURCE
1625 .\" Manual: MySQL Database System
1626 .\" Source: MySQL 5.5
1627 .\" Language: English
1628 .\"
1629+<<<<<<< TREE
1630 .TH "\FBNDB_MGM\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1631+=======
1632+.TH "\FBNDB_MGM\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1633+>>>>>>> MERGE-SOURCE
1634 .\" -----------------------------------------------------------------
1635 .\" * Define some portability stuff
1636 .\" -----------------------------------------------------------------
1637
1638=== modified file 'man/ndb_mgmd.8'
1639--- man/ndb_mgmd.8 2014-06-03 13:14:25 +0000
1640+++ man/ndb_mgmd.8 2014-07-30 19:40:33 +0000
1641@@ -2,12 +2,20 @@
1642 .\" Title: \fBndb_mgmd\fR
1643 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1644 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1645+<<<<<<< TREE
1646 .\" Date: 05/11/2014
1647+=======
1648+.\" Date: 03/14/2014
1649+>>>>>>> MERGE-SOURCE
1650 .\" Manual: MySQL Database System
1651 .\" Source: MySQL 5.5
1652 .\" Language: English
1653 .\"
1654+<<<<<<< TREE
1655 .TH "\FBNDB_MGMD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1656+=======
1657+.TH "\FBNDB_MGMD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1658+>>>>>>> MERGE-SOURCE
1659 .\" -----------------------------------------------------------------
1660 .\" * Define some portability stuff
1661 .\" -----------------------------------------------------------------
1662
1663=== modified file 'man/ndb_print_backup_file.1'
1664--- man/ndb_print_backup_file.1 2014-06-03 13:14:25 +0000
1665+++ man/ndb_print_backup_file.1 2014-07-30 19:40:33 +0000
1666@@ -2,12 +2,20 @@
1667 .\" Title: \fBndb_print_backup_file\fR
1668 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1669 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1670+<<<<<<< TREE
1671 .\" Date: 05/11/2014
1672+=======
1673+.\" Date: 03/14/2014
1674+>>>>>>> MERGE-SOURCE
1675 .\" Manual: MySQL Database System
1676 .\" Source: MySQL 5.5
1677 .\" Language: English
1678 .\"
1679+<<<<<<< TREE
1680 .TH "\FBNDB_PRINT_BACKUP_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1681+=======
1682+.TH "\FBNDB_PRINT_BACKUP_" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1683+>>>>>>> MERGE-SOURCE
1684 .\" -----------------------------------------------------------------
1685 .\" * Define some portability stuff
1686 .\" -----------------------------------------------------------------
1687
1688=== modified file 'man/ndb_print_schema_file.1'
1689--- man/ndb_print_schema_file.1 2014-06-03 13:14:25 +0000
1690+++ man/ndb_print_schema_file.1 2014-07-30 19:40:33 +0000
1691@@ -2,12 +2,20 @@
1692 .\" Title: \fBndb_print_schema_file\fR
1693 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1694 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1695+<<<<<<< TREE
1696 .\" Date: 05/11/2014
1697+=======
1698+.\" Date: 03/14/2014
1699+>>>>>>> MERGE-SOURCE
1700 .\" Manual: MySQL Database System
1701 .\" Source: MySQL 5.5
1702 .\" Language: English
1703 .\"
1704+<<<<<<< TREE
1705 .TH "\FBNDB_PRINT_SCHEMA_" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1706+=======
1707+.TH "\FBNDB_PRINT_SCHEMA_" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1708+>>>>>>> MERGE-SOURCE
1709 .\" -----------------------------------------------------------------
1710 .\" * Define some portability stuff
1711 .\" -----------------------------------------------------------------
1712
1713=== modified file 'man/ndb_print_sys_file.1'
1714--- man/ndb_print_sys_file.1 2014-06-03 13:14:25 +0000
1715+++ man/ndb_print_sys_file.1 2014-07-30 19:40:33 +0000
1716@@ -2,12 +2,20 @@
1717 .\" Title: \fBndb_print_sys_file\fR
1718 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1719 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1720+<<<<<<< TREE
1721 .\" Date: 05/11/2014
1722+=======
1723+.\" Date: 03/14/2014
1724+>>>>>>> MERGE-SOURCE
1725 .\" Manual: MySQL Database System
1726 .\" Source: MySQL 5.5
1727 .\" Language: English
1728 .\"
1729+<<<<<<< TREE
1730 .TH "\FBNDB_PRINT_SYS_FIL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1731+=======
1732+.TH "\FBNDB_PRINT_SYS_FIL" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1733+>>>>>>> MERGE-SOURCE
1734 .\" -----------------------------------------------------------------
1735 .\" * Define some portability stuff
1736 .\" -----------------------------------------------------------------
1737
1738=== modified file 'man/ndb_restore.1'
1739--- man/ndb_restore.1 2014-06-03 13:14:25 +0000
1740+++ man/ndb_restore.1 2014-07-30 19:40:33 +0000
1741@@ -2,12 +2,20 @@
1742 .\" Title: \fBndb_restore\fR
1743 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1744 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1745+<<<<<<< TREE
1746 .\" Date: 05/11/2014
1747+=======
1748+.\" Date: 03/14/2014
1749+>>>>>>> MERGE-SOURCE
1750 .\" Manual: MySQL Database System
1751 .\" Source: MySQL 5.5
1752 .\" Language: English
1753 .\"
1754+<<<<<<< TREE
1755 .TH "\FBNDB_RESTORE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1756+=======
1757+.TH "\FBNDB_RESTORE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1758+>>>>>>> MERGE-SOURCE
1759 .\" -----------------------------------------------------------------
1760 .\" * Define some portability stuff
1761 .\" -----------------------------------------------------------------
1762
1763=== modified file 'man/ndb_select_all.1'
1764--- man/ndb_select_all.1 2014-06-03 13:14:25 +0000
1765+++ man/ndb_select_all.1 2014-07-30 19:40:33 +0000
1766@@ -2,12 +2,20 @@
1767 .\" Title: \fBndb_select_all\fR
1768 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1769 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1770+<<<<<<< TREE
1771 .\" Date: 05/11/2014
1772+=======
1773+.\" Date: 03/14/2014
1774+>>>>>>> MERGE-SOURCE
1775 .\" Manual: MySQL Database System
1776 .\" Source: MySQL 5.5
1777 .\" Language: English
1778 .\"
1779+<<<<<<< TREE
1780 .TH "\FBNDB_SELECT_ALL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1781+=======
1782+.TH "\FBNDB_SELECT_ALL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1783+>>>>>>> MERGE-SOURCE
1784 .\" -----------------------------------------------------------------
1785 .\" * Define some portability stuff
1786 .\" -----------------------------------------------------------------
1787
1788=== modified file 'man/ndb_select_count.1'
1789--- man/ndb_select_count.1 2014-06-03 13:14:25 +0000
1790+++ man/ndb_select_count.1 2014-07-30 19:40:33 +0000
1791@@ -2,12 +2,20 @@
1792 .\" Title: \fBndb_select_count\fR
1793 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1794 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1795+<<<<<<< TREE
1796 .\" Date: 05/11/2014
1797+=======
1798+.\" Date: 03/14/2014
1799+>>>>>>> MERGE-SOURCE
1800 .\" Manual: MySQL Database System
1801 .\" Source: MySQL 5.5
1802 .\" Language: English
1803 .\"
1804+<<<<<<< TREE
1805 .TH "\FBNDB_SELECT_COUNT\" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1806+=======
1807+.TH "\FBNDB_SELECT_COUNT\" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1808+>>>>>>> MERGE-SOURCE
1809 .\" -----------------------------------------------------------------
1810 .\" * Define some portability stuff
1811 .\" -----------------------------------------------------------------
1812
1813=== modified file 'man/ndb_show_tables.1'
1814--- man/ndb_show_tables.1 2014-06-03 13:14:25 +0000
1815+++ man/ndb_show_tables.1 2014-07-30 19:40:33 +0000
1816@@ -2,12 +2,20 @@
1817 .\" Title: \fBndb_show_tables\fR
1818 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1819 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1820+<<<<<<< TREE
1821 .\" Date: 05/11/2014
1822+=======
1823+.\" Date: 03/14/2014
1824+>>>>>>> MERGE-SOURCE
1825 .\" Manual: MySQL Database System
1826 .\" Source: MySQL 5.5
1827 .\" Language: English
1828 .\"
1829+<<<<<<< TREE
1830 .TH "\FBNDB_SHOW_TABLES\F" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1831+=======
1832+.TH "\FBNDB_SHOW_TABLES\F" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1833+>>>>>>> MERGE-SOURCE
1834 .\" -----------------------------------------------------------------
1835 .\" * Define some portability stuff
1836 .\" -----------------------------------------------------------------
1837
1838=== modified file 'man/ndb_size.pl.1'
1839--- man/ndb_size.pl.1 2014-06-03 13:14:25 +0000
1840+++ man/ndb_size.pl.1 2014-07-30 19:40:33 +0000
1841@@ -2,12 +2,20 @@
1842 .\" Title: \fBndb_size.pl\fR
1843 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1844 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1845+<<<<<<< TREE
1846 .\" Date: 05/11/2014
1847+=======
1848+.\" Date: 03/14/2014
1849+>>>>>>> MERGE-SOURCE
1850 .\" Manual: MySQL Database System
1851 .\" Source: MySQL 5.5
1852 .\" Language: English
1853 .\"
1854+<<<<<<< TREE
1855 .TH "\FBNDB_SIZE\&.PL\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1856+=======
1857+.TH "\FBNDB_SIZE\&.PL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1858+>>>>>>> MERGE-SOURCE
1859 .\" -----------------------------------------------------------------
1860 .\" * Define some portability stuff
1861 .\" -----------------------------------------------------------------
1862
1863=== modified file 'man/ndb_waiter.1'
1864--- man/ndb_waiter.1 2014-06-03 13:14:25 +0000
1865+++ man/ndb_waiter.1 2014-07-30 19:40:33 +0000
1866@@ -2,12 +2,20 @@
1867 .\" Title: \fBndb_waiter\fR
1868 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1869 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1870+<<<<<<< TREE
1871 .\" Date: 05/11/2014
1872+=======
1873+.\" Date: 03/14/2014
1874+>>>>>>> MERGE-SOURCE
1875 .\" Manual: MySQL Database System
1876 .\" Source: MySQL 5.5
1877 .\" Language: English
1878 .\"
1879+<<<<<<< TREE
1880 .TH "\FBNDB_WAITER\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1881+=======
1882+.TH "\FBNDB_WAITER\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1883+>>>>>>> MERGE-SOURCE
1884 .\" -----------------------------------------------------------------
1885 .\" * Define some portability stuff
1886 .\" -----------------------------------------------------------------
1887
1888=== modified file 'man/ndbd.8'
1889--- man/ndbd.8 2014-06-03 13:14:25 +0000
1890+++ man/ndbd.8 2014-07-30 19:40:33 +0000
1891@@ -2,12 +2,20 @@
1892 .\" Title: \fBndbd\fR
1893 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1894 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1895+<<<<<<< TREE
1896 .\" Date: 05/11/2014
1897+=======
1898+.\" Date: 03/14/2014
1899+>>>>>>> MERGE-SOURCE
1900 .\" Manual: MySQL Database System
1901 .\" Source: MySQL 5.5
1902 .\" Language: English
1903 .\"
1904+<<<<<<< TREE
1905 .TH "\FBNDBD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1906+=======
1907+.TH "\FBNDBD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1908+>>>>>>> MERGE-SOURCE
1909 .\" -----------------------------------------------------------------
1910 .\" * Define some portability stuff
1911 .\" -----------------------------------------------------------------
1912
1913=== modified file 'man/ndbd_redo_log_reader.1'
1914--- man/ndbd_redo_log_reader.1 2014-06-03 13:14:25 +0000
1915+++ man/ndbd_redo_log_reader.1 2014-07-30 19:40:33 +0000
1916@@ -2,12 +2,20 @@
1917 .\" Title: \fBndbd_redo_log_reader\fR
1918 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1919 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1920+<<<<<<< TREE
1921 .\" Date: 05/11/2014
1922+=======
1923+.\" Date: 03/14/2014
1924+>>>>>>> MERGE-SOURCE
1925 .\" Manual: MySQL Database System
1926 .\" Source: MySQL 5.5
1927 .\" Language: English
1928 .\"
1929+<<<<<<< TREE
1930 .TH "\FBNDBD_REDO_LOG_REA" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1931+=======
1932+.TH "\FBNDBD_REDO_LOG_REA" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1933+>>>>>>> MERGE-SOURCE
1934 .\" -----------------------------------------------------------------
1935 .\" * Define some portability stuff
1936 .\" -----------------------------------------------------------------
1937
1938=== modified file 'man/ndbinfo_select_all.1'
1939--- man/ndbinfo_select_all.1 2014-06-03 13:14:25 +0000
1940+++ man/ndbinfo_select_all.1 2014-07-30 19:40:33 +0000
1941@@ -2,12 +2,20 @@
1942 .\" Title: \fBndbinfo_select_all\fR
1943 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1944 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1945+<<<<<<< TREE
1946 .\" Date: 05/11/2014
1947+=======
1948+.\" Date: 03/14/2014
1949+>>>>>>> MERGE-SOURCE
1950 .\" Manual: MySQL Database System
1951 .\" Source: MySQL 5.5
1952 .\" Language: English
1953 .\"
1954+<<<<<<< TREE
1955 .TH "\FBNDBINFO_SELECT_AL" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1956+=======
1957+.TH "\FBNDBINFO_SELECT_AL" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1958+>>>>>>> MERGE-SOURCE
1959 .\" -----------------------------------------------------------------
1960 .\" * Define some portability stuff
1961 .\" -----------------------------------------------------------------
1962
1963=== modified file 'man/ndbmtd.8'
1964--- man/ndbmtd.8 2014-06-03 13:14:25 +0000
1965+++ man/ndbmtd.8 2014-07-30 19:40:33 +0000
1966@@ -2,12 +2,20 @@
1967 .\" Title: \fBndbmtd\fR
1968 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1969 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1970+<<<<<<< TREE
1971 .\" Date: 05/11/2014
1972+=======
1973+.\" Date: 03/14/2014
1974+>>>>>>> MERGE-SOURCE
1975 .\" Manual: MySQL Database System
1976 .\" Source: MySQL 5.5
1977 .\" Language: English
1978 .\"
1979+<<<<<<< TREE
1980 .TH "\FBNDBMTD\FR" "8" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
1981+=======
1982+.TH "\FBNDBMTD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1983+>>>>>>> MERGE-SOURCE
1984 .\" -----------------------------------------------------------------
1985 .\" * Define some portability stuff
1986 .\" -----------------------------------------------------------------
1987
1988=== modified file 'man/perror.1'
1989--- man/perror.1 2014-06-03 13:14:25 +0000
1990+++ man/perror.1 2014-07-30 19:40:33 +0000
1991@@ -2,12 +2,20 @@
1992 .\" Title: \fBperror\fR
1993 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1994 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1995+<<<<<<< TREE
1996 .\" Date: 05/11/2014
1997+=======
1998+.\" Date: 03/14/2014
1999+>>>>>>> MERGE-SOURCE
2000 .\" Manual: MySQL Database System
2001 .\" Source: MySQL 5.5
2002 .\" Language: English
2003 .\"
2004+<<<<<<< TREE
2005 .TH "\FBPERROR\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2006+=======
2007+.TH "\FBPERROR\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2008+>>>>>>> MERGE-SOURCE
2009 .\" -----------------------------------------------------------------
2010 .\" * Define some portability stuff
2011 .\" -----------------------------------------------------------------
2012
2013=== modified file 'man/replace.1'
2014--- man/replace.1 2014-06-03 13:14:25 +0000
2015+++ man/replace.1 2014-07-30 19:40:33 +0000
2016@@ -2,12 +2,20 @@
2017 .\" Title: \fBreplace\fR
2018 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2019 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2020+<<<<<<< TREE
2021 .\" Date: 05/11/2014
2022+=======
2023+.\" Date: 03/14/2014
2024+>>>>>>> MERGE-SOURCE
2025 .\" Manual: MySQL Database System
2026 .\" Source: MySQL 5.5
2027 .\" Language: English
2028 .\"
2029+<<<<<<< TREE
2030 .TH "\FBREPLACE\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2031+=======
2032+.TH "\FBREPLACE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2033+>>>>>>> MERGE-SOURCE
2034 .\" -----------------------------------------------------------------
2035 .\" * Define some portability stuff
2036 .\" -----------------------------------------------------------------
2037
2038=== modified file 'man/resolve_stack_dump.1'
2039--- man/resolve_stack_dump.1 2014-06-03 13:14:25 +0000
2040+++ man/resolve_stack_dump.1 2014-07-30 19:40:33 +0000
2041@@ -2,12 +2,20 @@
2042 .\" Title: \fBresolve_stack_dump\fR
2043 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2044 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2045+<<<<<<< TREE
2046 .\" Date: 05/11/2014
2047+=======
2048+.\" Date: 03/14/2014
2049+>>>>>>> MERGE-SOURCE
2050 .\" Manual: MySQL Database System
2051 .\" Source: MySQL 5.5
2052 .\" Language: English
2053 .\"
2054+<<<<<<< TREE
2055 .TH "\FBRESOLVE_STACK_DUM" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2056+=======
2057+.TH "\FBRESOLVE_STACK_DUM" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2058+>>>>>>> MERGE-SOURCE
2059 .\" -----------------------------------------------------------------
2060 .\" * Define some portability stuff
2061 .\" -----------------------------------------------------------------
2062
2063=== modified file 'man/resolveip.1'
2064--- man/resolveip.1 2014-06-03 13:14:25 +0000
2065+++ man/resolveip.1 2014-07-30 19:40:33 +0000
2066@@ -2,12 +2,20 @@
2067 .\" Title: \fBresolveip\fR
2068 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2069 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2070+<<<<<<< TREE
2071 .\" Date: 05/11/2014
2072+=======
2073+.\" Date: 03/14/2014
2074+>>>>>>> MERGE-SOURCE
2075 .\" Manual: MySQL Database System
2076 .\" Source: MySQL 5.5
2077 .\" Language: English
2078 .\"
2079+<<<<<<< TREE
2080 .TH "\FBRESOLVEIP\FR" "1" "05/11/2014" "MySQL 5\&.5" "MySQL Database System"
2081+=======
2082+.TH "\FBRESOLVEIP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2083+>>>>>>> MERGE-SOURCE
2084 .\" -----------------------------------------------------------------
2085 .\" * Define some portability stuff
2086 .\" -----------------------------------------------------------------
2087
2088=== renamed file 'mysql-test/r/audit_log.result' => 'mysql-test/r/audit_log.result.THIS'
2089=== added file 'mysql-test/r/audit_log_csv.result'
2090--- mysql-test/r/audit_log_csv.result 1970-01-01 00:00:00 +0000
2091+++ mysql-test/r/audit_log_csv.result 2014-07-30 19:40:33 +0000
2092@@ -0,0 +1,84 @@
2093+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2094+CREATE TABLE t1
2095+(c1 INT,
2096+c2 CHAR(20));
2097+ERROR 42S01: Table 't1' already exists
2098+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2099+SELECT * FROM t1;
2100+c1 c2
2101+1 a
2102+2 b
2103+3 c
2104+SELECT * FROM t2;
2105+ERROR 42S02: Table 'test.t2' doesn't exist
2106+DROP TABLE t1;
2107+PREPARE stmt1 FROM 'SELECT 1';
2108+EXECUTE stmt1;
2109+1
2110+1
2111+SHOW STATUS LIKE 'audit_log%';
2112+Variable_name Value
2113+DEALLOCATE PREPARE stmt1;
2114+show variables like 'audit_log%';
2115+Variable_name Value
2116+audit_log_buffer_size 1048576
2117+audit_log_file test_audit.log
2118+audit_log_flush OFF
2119+audit_log_format CSV
2120+audit_log_handler FILE
2121+audit_log_policy ALL
2122+audit_log_rotate_on_size 0
2123+audit_log_rotations 0
2124+audit_log_strategy SEMISYNCHRONOUS
2125+audit_log_syslog_facility LOG_USER
2126+audit_log_syslog_ident percona-audit
2127+audit_log_syslog_priority LOG_INFO
2128+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
2129+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
2130+create table t1 (id int);
2131+create table t2 (id int);
2132+insert into t1 values (1), (2);
2133+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
2134+select * from t1;
2135+id
2136+1
2137+2
2138+alter table t1 rename renamed_t1;
2139+select * from t_doesnt_exist;
2140+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
2141+syntax_error_query;
2142+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
2143+drop table renamed_t1, t2;
2144+show variables like 'audit_log%';
2145+Variable_name Value
2146+audit_log_buffer_size 1048576
2147+audit_log_file test_audit.log
2148+audit_log_flush OFF
2149+audit_log_format CSV
2150+audit_log_handler FILE
2151+audit_log_policy ALL
2152+audit_log_rotate_on_size 0
2153+audit_log_rotations 0
2154+audit_log_strategy SEMISYNCHRONOUS
2155+audit_log_syslog_facility LOG_USER
2156+audit_log_syslog_ident percona-audit
2157+audit_log_syslog_priority LOG_INFO
2158+create database sa_db;
2159+create table t1 (id2 int);
2160+insert into t1 values (1), (2);
2161+select * from t1;
2162+id2
2163+1
2164+2
2165+drop table t1;
2166+use sa_db;
2167+create table sa_t1(id int);
2168+insert into sa_t1 values (1), (2);
2169+drop table sa_t1;
2170+drop database sa_db;
2171+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
2172+drop user 'jeffrey'@'localhost';
2173+select '&;&&&""""<><<>>>>';
2174+&;&&&""""<><<>>>>
2175+&;&&&""""<><<>>>>
2176+set global audit_log_flush= ON;
2177
2178=== added file 'mysql-test/r/audit_log_json.result'
2179--- mysql-test/r/audit_log_json.result 1970-01-01 00:00:00 +0000
2180+++ mysql-test/r/audit_log_json.result 2014-07-30 19:40:33 +0000
2181@@ -0,0 +1,84 @@
2182+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2183+CREATE TABLE t1
2184+(c1 INT,
2185+c2 CHAR(20));
2186+ERROR 42S01: Table 't1' already exists
2187+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2188+SELECT * FROM t1;
2189+c1 c2
2190+1 a
2191+2 b
2192+3 c
2193+SELECT * FROM t2;
2194+ERROR 42S02: Table 'test.t2' doesn't exist
2195+DROP TABLE t1;
2196+PREPARE stmt1 FROM 'SELECT 1';
2197+EXECUTE stmt1;
2198+1
2199+1
2200+SHOW STATUS LIKE 'audit_log%';
2201+Variable_name Value
2202+DEALLOCATE PREPARE stmt1;
2203+show variables like 'audit_log%';
2204+Variable_name Value
2205+audit_log_buffer_size 1048576
2206+audit_log_file test_audit.log
2207+audit_log_flush OFF
2208+audit_log_format JSON
2209+audit_log_handler FILE
2210+audit_log_policy ALL
2211+audit_log_rotate_on_size 0
2212+audit_log_rotations 0
2213+audit_log_strategy SEMISYNCHRONOUS
2214+audit_log_syslog_facility LOG_USER
2215+audit_log_syslog_ident percona-audit
2216+audit_log_syslog_priority LOG_INFO
2217+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
2218+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
2219+create table t1 (id int);
2220+create table t2 (id int);
2221+insert into t1 values (1), (2);
2222+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
2223+select * from t1;
2224+id
2225+1
2226+2
2227+alter table t1 rename renamed_t1;
2228+select * from t_doesnt_exist;
2229+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
2230+syntax_error_query;
2231+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
2232+drop table renamed_t1, t2;
2233+show variables like 'audit_log%';
2234+Variable_name Value
2235+audit_log_buffer_size 1048576
2236+audit_log_file test_audit.log
2237+audit_log_flush OFF
2238+audit_log_format JSON
2239+audit_log_handler FILE
2240+audit_log_policy ALL
2241+audit_log_rotate_on_size 0
2242+audit_log_rotations 0
2243+audit_log_strategy SEMISYNCHRONOUS
2244+audit_log_syslog_facility LOG_USER
2245+audit_log_syslog_ident percona-audit
2246+audit_log_syslog_priority LOG_INFO
2247+create database sa_db;
2248+create table t1 (id2 int);
2249+insert into t1 values (1), (2);
2250+select * from t1;
2251+id2
2252+1
2253+2
2254+drop table t1;
2255+use sa_db;
2256+create table sa_t1(id int);
2257+insert into sa_t1 values (1), (2);
2258+drop table sa_t1;
2259+drop database sa_db;
2260+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
2261+drop user 'jeffrey'@'localhost';
2262+select '&;&&&""""<><<>>>>';
2263+&;&&&""""<><<>>>>
2264+&;&&&""""<><<>>>>
2265+set global audit_log_flush= ON;
2266
2267=== added file 'mysql-test/r/audit_log_new.result'
2268--- mysql-test/r/audit_log_new.result 1970-01-01 00:00:00 +0000
2269+++ mysql-test/r/audit_log_new.result 2014-07-30 19:40:33 +0000
2270@@ -0,0 +1,84 @@
2271+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2272+CREATE TABLE t1
2273+(c1 INT,
2274+c2 CHAR(20));
2275+ERROR 42S01: Table 't1' already exists
2276+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2277+SELECT * FROM t1;
2278+c1 c2
2279+1 a
2280+2 b
2281+3 c
2282+SELECT * FROM t2;
2283+ERROR 42S02: Table 'test.t2' doesn't exist
2284+DROP TABLE t1;
2285+PREPARE stmt1 FROM 'SELECT 1';
2286+EXECUTE stmt1;
2287+1
2288+1
2289+SHOW STATUS LIKE 'audit_log%';
2290+Variable_name Value
2291+DEALLOCATE PREPARE stmt1;
2292+show variables like 'audit_log%';
2293+Variable_name Value
2294+audit_log_buffer_size 1048576
2295+audit_log_file test_audit.log
2296+audit_log_flush OFF
2297+audit_log_format NEW
2298+audit_log_handler FILE
2299+audit_log_policy LOGINS
2300+audit_log_rotate_on_size 0
2301+audit_log_rotations 0
2302+audit_log_strategy SEMISYNCHRONOUS
2303+audit_log_syslog_facility LOG_USER
2304+audit_log_syslog_ident percona-audit
2305+audit_log_syslog_priority LOG_INFO
2306+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
2307+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
2308+create table t1 (id int);
2309+create table t2 (id int);
2310+insert into t1 values (1), (2);
2311+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
2312+select * from t1;
2313+id
2314+1
2315+2
2316+alter table t1 rename renamed_t1;
2317+select * from t_doesnt_exist;
2318+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
2319+syntax_error_query;
2320+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
2321+drop table renamed_t1, t2;
2322+show variables like 'audit_log%';
2323+Variable_name Value
2324+audit_log_buffer_size 1048576
2325+audit_log_file test_audit.log
2326+audit_log_flush OFF
2327+audit_log_format NEW
2328+audit_log_handler FILE
2329+audit_log_policy LOGINS
2330+audit_log_rotate_on_size 0
2331+audit_log_rotations 0
2332+audit_log_strategy SEMISYNCHRONOUS
2333+audit_log_syslog_facility LOG_USER
2334+audit_log_syslog_ident percona-audit
2335+audit_log_syslog_priority LOG_INFO
2336+create database sa_db;
2337+create table t1 (id2 int);
2338+insert into t1 values (1), (2);
2339+select * from t1;
2340+id2
2341+1
2342+2
2343+drop table t1;
2344+use sa_db;
2345+create table sa_t1(id int);
2346+insert into sa_t1 values (1), (2);
2347+drop table sa_t1;
2348+drop database sa_db;
2349+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
2350+drop user 'jeffrey'@'localhost';
2351+select '&;&&&""""<><<>>>>';
2352+&;&&&""""<><<>>>>
2353+&;&&&""""<><<>>>>
2354+set global audit_log_flush= ON;
2355
2356=== added file 'mysql-test/r/audit_log_old.result'
2357--- mysql-test/r/audit_log_old.result 1970-01-01 00:00:00 +0000
2358+++ mysql-test/r/audit_log_old.result 2014-07-30 19:40:33 +0000
2359@@ -0,0 +1,84 @@
2360+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2361+CREATE TABLE t1
2362+(c1 INT,
2363+c2 CHAR(20));
2364+ERROR 42S01: Table 't1' already exists
2365+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2366+SELECT * FROM t1;
2367+c1 c2
2368+1 a
2369+2 b
2370+3 c
2371+SELECT * FROM t2;
2372+ERROR 42S02: Table 'test.t2' doesn't exist
2373+DROP TABLE t1;
2374+PREPARE stmt1 FROM 'SELECT 1';
2375+EXECUTE stmt1;
2376+1
2377+1
2378+SHOW STATUS LIKE 'audit_log%';
2379+Variable_name Value
2380+DEALLOCATE PREPARE stmt1;
2381+show variables like 'audit_log%';
2382+Variable_name Value
2383+audit_log_buffer_size 4096
2384+audit_log_file test_audit.log
2385+audit_log_flush OFF
2386+audit_log_format OLD
2387+audit_log_handler FILE
2388+audit_log_policy ALL
2389+audit_log_rotate_on_size 0
2390+audit_log_rotations 0
2391+audit_log_strategy ASYNCHRONOUS
2392+audit_log_syslog_facility LOG_USER
2393+audit_log_syslog_ident percona-audit
2394+audit_log_syslog_priority LOG_INFO
2395+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
2396+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
2397+create table t1 (id int);
2398+create table t2 (id int);
2399+insert into t1 values (1), (2);
2400+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
2401+select * from t1;
2402+id
2403+1
2404+2
2405+alter table t1 rename renamed_t1;
2406+select * from t_doesnt_exist;
2407+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
2408+syntax_error_query;
2409+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
2410+drop table renamed_t1, t2;
2411+show variables like 'audit_log%';
2412+Variable_name Value
2413+audit_log_buffer_size 4096
2414+audit_log_file test_audit.log
2415+audit_log_flush OFF
2416+audit_log_format OLD
2417+audit_log_handler FILE
2418+audit_log_policy ALL
2419+audit_log_rotate_on_size 0
2420+audit_log_rotations 0
2421+audit_log_strategy ASYNCHRONOUS
2422+audit_log_syslog_facility LOG_USER
2423+audit_log_syslog_ident percona-audit
2424+audit_log_syslog_priority LOG_INFO
2425+create database sa_db;
2426+create table t1 (id2 int);
2427+insert into t1 values (1), (2);
2428+select * from t1;
2429+id2
2430+1
2431+2
2432+drop table t1;
2433+use sa_db;
2434+create table sa_t1(id int);
2435+insert into sa_t1 values (1), (2);
2436+drop table sa_t1;
2437+drop database sa_db;
2438+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
2439+drop user 'jeffrey'@'localhost';
2440+select '&;&&&""""<><<>>>>';
2441+&;&&&""""<><<>>>>
2442+&;&&&""""<><<>>>>
2443+set global audit_log_flush= ON;
2444
2445=== added file 'mysql-test/r/audit_log_syslog.result'
2446--- mysql-test/r/audit_log_syslog.result 1970-01-01 00:00:00 +0000
2447+++ mysql-test/r/audit_log_syslog.result 2014-07-30 19:40:33 +0000
2448@@ -0,0 +1,83 @@
2449+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2450+CREATE TABLE t1
2451+(c1 INT,
2452+c2 CHAR(20));
2453+ERROR 42S01: Table 't1' already exists
2454+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2455+SELECT * FROM t1;
2456+c1 c2
2457+1 a
2458+2 b
2459+3 c
2460+SELECT * FROM t2;
2461+ERROR 42S02: Table 'test.t2' doesn't exist
2462+DROP TABLE t1;
2463+PREPARE stmt1 FROM 'SELECT 1';
2464+EXECUTE stmt1;
2465+1
2466+1
2467+SHOW STATUS LIKE 'audit_log%';
2468+Variable_name Value
2469+DEALLOCATE PREPARE stmt1;
2470+show variables like 'audit_log%';
2471+Variable_name Value
2472+audit_log_buffer_size 1048576
2473+audit_log_file audit.log
2474+audit_log_flush OFF
2475+audit_log_format CSV
2476+audit_log_handler SYSLOG
2477+audit_log_policy ALL
2478+audit_log_rotate_on_size 0
2479+audit_log_rotations 0
2480+audit_log_strategy ASYNCHRONOUS
2481+audit_log_syslog_facility LOG_AUTH
2482+audit_log_syslog_ident test_audit
2483+audit_log_syslog_priority LOG_INFO
2484+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
2485+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
2486+create table t1 (id int);
2487+create table t2 (id int);
2488+insert into t1 values (1), (2);
2489+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
2490+select * from t1;
2491+id
2492+1
2493+2
2494+alter table t1 rename renamed_t1;
2495+select * from t_doesnt_exist;
2496+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
2497+syntax_error_query;
2498+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
2499+drop table renamed_t1, t2;
2500+show variables like 'audit_log%';
2501+Variable_name Value
2502+audit_log_buffer_size 1048576
2503+audit_log_file audit.log
2504+audit_log_flush OFF
2505+audit_log_format CSV
2506+audit_log_handler SYSLOG
2507+audit_log_policy ALL
2508+audit_log_rotate_on_size 0
2509+audit_log_rotations 0
2510+audit_log_strategy ASYNCHRONOUS
2511+audit_log_syslog_facility LOG_AUTH
2512+audit_log_syslog_ident test_audit
2513+audit_log_syslog_priority LOG_INFO
2514+create database sa_db;
2515+create table t1 (id2 int);
2516+insert into t1 values (1), (2);
2517+select * from t1;
2518+id2
2519+1
2520+2
2521+drop table t1;
2522+use sa_db;
2523+create table sa_t1(id int);
2524+insert into sa_t1 values (1), (2);
2525+drop table sa_t1;
2526+drop database sa_db;
2527+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
2528+drop user 'jeffrey'@'localhost';
2529+select '&;&&&""""<><<>>>>';
2530+&;&&&""""<><<>>>>
2531+&;&&&""""<><<>>>>
2532
2533=== removed file 'mysql-test/t/audit_log-master.opt'
2534--- mysql-test/t/audit_log-master.opt 2014-04-21 12:07:45 +0000
2535+++ mysql-test/t/audit_log-master.opt 1970-01-01 00:00:00 +0000
2536@@ -1,4 +0,0 @@
2537-$AUDIT_LOG_OPT
2538-$AUDIT_LOG_LOAD
2539---audit_log_file=test_audit.log
2540---audit_log_buffer_size=4096
2541
2542=== renamed file 'mysql-test/t/audit_log.test' => 'mysql-test/t/audit_log.test.THIS'
2543=== added file 'mysql-test/t/audit_log_csv-master.opt'
2544--- mysql-test/t/audit_log_csv-master.opt 1970-01-01 00:00:00 +0000
2545+++ mysql-test/t/audit_log_csv-master.opt 2014-07-30 19:40:33 +0000
2546@@ -0,0 +1,5 @@
2547+$AUDIT_LOG_OPT
2548+$AUDIT_LOG_LOAD
2549+--audit_log_file=test_audit.log
2550+--audit-log-format=CSV
2551+--audit_log_strategy=SEMISYNCHRONOUS
2552
2553=== added file 'mysql-test/t/audit_log_csv.test'
2554--- mysql-test/t/audit_log_csv.test 1970-01-01 00:00:00 +0000
2555+++ mysql-test/t/audit_log_csv.test 2014-07-30 19:40:33 +0000
2556@@ -0,0 +1,20 @@
2557+--source include/not_embedded.inc
2558+
2559+let $MYSQLD_DATADIR= `select @@datadir`;
2560+let MYSQLD_DATADIR= $MYSQLD_DATADIR;
2561+
2562+--source include/audit_log_events.inc
2563+
2564+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_csv.log
2565+set global audit_log_flush= ON;
2566+perl;
2567+ eval "use Text::CSV; 1" or exit 0;
2568+ my $p = Text::CSV->new({ binary => 1, auto_diag => 1, sep_char => ',' });
2569+ open my $file, $ENV{'MYSQLD_DATADIR'} . '/test_audit_csv.log' or die "Could not open log: $!";
2570+ while ($p->getline($file)) {};
2571+ if (not $p->eof) {
2572+ die "CSV parse error " . $p->error_diag();
2573+ }
2574+ close $file;
2575+EOF
2576+--remove_file $MYSQLD_DATADIR/test_audit.log
2577
2578=== added file 'mysql-test/t/audit_log_json-master.opt'
2579--- mysql-test/t/audit_log_json-master.opt 1970-01-01 00:00:00 +0000
2580+++ mysql-test/t/audit_log_json-master.opt 2014-07-30 19:40:33 +0000
2581@@ -0,0 +1,5 @@
2582+$AUDIT_LOG_OPT
2583+$AUDIT_LOG_LOAD
2584+--audit_log_file=test_audit.log
2585+--audit-log-format=JSON
2586+--audit_log_strategy=SEMISYNCHRONOUS
2587
2588=== added file 'mysql-test/t/audit_log_json.test'
2589--- mysql-test/t/audit_log_json.test 1970-01-01 00:00:00 +0000
2590+++ mysql-test/t/audit_log_json.test 2014-07-30 19:40:33 +0000
2591@@ -0,0 +1,18 @@
2592+--source include/not_embedded.inc
2593+
2594+let $MYSQLD_DATADIR= `select @@datadir`;
2595+let MYSQLD_DATADIR= $MYSQLD_DATADIR;
2596+
2597+--source include/audit_log_events.inc
2598+
2599+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_json.log
2600+set global audit_log_flush= ON;
2601+perl;
2602+ eval "use JSON qw(decode_json); 1" or exit 0;
2603+ open my $file, $ENV{'MYSQLD_DATADIR'} . '/test_audit_json.log' or die "Could not open log: $!";
2604+ while (my $line = <$file>) {
2605+ decode_json($line);
2606+ }
2607+ close $file;
2608+EOF
2609+--remove_file $MYSQLD_DATADIR/test_audit.log
2610
2611=== added file 'mysql-test/t/audit_log_new-master.opt'
2612--- mysql-test/t/audit_log_new-master.opt 1970-01-01 00:00:00 +0000
2613+++ mysql-test/t/audit_log_new-master.opt 2014-07-30 19:40:33 +0000
2614@@ -0,0 +1,6 @@
2615+$AUDIT_LOG_OPT
2616+$AUDIT_LOG_LOAD
2617+--audit_log_file=test_audit.log
2618+--audit_log_policy=LOGINS
2619+--audit-log-format=NEW
2620+--audit_log_strategy=SEMISYNCHRONOUS
2621
2622=== added file 'mysql-test/t/audit_log_new.test'
2623--- mysql-test/t/audit_log_new.test 1970-01-01 00:00:00 +0000
2624+++ mysql-test/t/audit_log_new.test 2014-07-30 19:40:33 +0000
2625@@ -0,0 +1,15 @@
2626+--source include/not_embedded.inc
2627+
2628+let $MYSQLD_DATADIR= `select @@datadir`;
2629+let MYSQLD_DATADIR= $MYSQLD_DATADIR;
2630+
2631+--source include/audit_log_events.inc
2632+
2633+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_new.log
2634+set global audit_log_flush= ON;
2635+perl;
2636+ eval "use XML::Parser; 1" or exit 0;
2637+ $p = new XML::Parser;
2638+ $p->parsefile($ENV{'MYSQLD_DATADIR'} . '/test_audit_new.log');
2639+EOF
2640+--remove_file $MYSQLD_DATADIR/test_audit.log
2641
2642=== added file 'mysql-test/t/audit_log_old-master.opt'
2643--- mysql-test/t/audit_log_old-master.opt 1970-01-01 00:00:00 +0000
2644+++ mysql-test/t/audit_log_old-master.opt 2014-07-30 19:40:33 +0000
2645@@ -0,0 +1,5 @@
2646+$AUDIT_LOG_OPT
2647+$AUDIT_LOG_LOAD
2648+--audit_log_file=test_audit.log
2649+--audit_log_buffer_size=4096
2650+--audit_log_strategy=ASYNCHRONOUS
2651
2652=== added file 'mysql-test/t/audit_log_old.test'
2653--- mysql-test/t/audit_log_old.test 1970-01-01 00:00:00 +0000
2654+++ mysql-test/t/audit_log_old.test 2014-07-30 19:40:33 +0000
2655@@ -0,0 +1,15 @@
2656+--source include/not_embedded.inc
2657+
2658+let $MYSQLD_DATADIR= `select @@datadir`;
2659+let MYSQLD_DATADIR= $MYSQLD_DATADIR;
2660+
2661+--source include/audit_log_events.inc
2662+
2663+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_old.log
2664+set global audit_log_flush= ON;
2665+perl;
2666+ eval "use XML::Parser; 1" or exit 0;
2667+ $p = new XML::Parser;
2668+ $p->parsefile($ENV{'MYSQLD_DATADIR'} . '/test_audit_old.log');
2669+EOF
2670+--remove_file $MYSQLD_DATADIR/test_audit.log
2671
2672=== added file 'mysql-test/t/audit_log_syslog-master.opt'
2673--- mysql-test/t/audit_log_syslog-master.opt 1970-01-01 00:00:00 +0000
2674+++ mysql-test/t/audit_log_syslog-master.opt 2014-07-30 19:40:33 +0000
2675@@ -0,0 +1,7 @@
2676+$AUDIT_LOG_OPT
2677+$AUDIT_LOG_LOAD
2678+--audit-log-format=CSV
2679+--audit_log_handler=SYSLOG
2680+--audit_log_syslog_ident=test_audit
2681+--audit_log_syslog_facility=LOG_AUTH
2682+--audit_log_syslog_priority=LOG_INFO
2683
2684=== added file 'mysql-test/t/audit_log_syslog.test'
2685--- mysql-test/t/audit_log_syslog.test 1970-01-01 00:00:00 +0000
2686+++ mysql-test/t/audit_log_syslog.test 2014-07-30 19:40:33 +0000
2687@@ -0,0 +1,3 @@
2688+--source include/not_embedded.inc
2689+
2690+--source include/audit_log_events.inc
2691
2692=== modified file 'packaging/rpm-oel/mysql.spec.in'
2693--- packaging/rpm-oel/mysql.spec.in 2014-05-11 16:24:12 +0000
2694+++ packaging/rpm-oel/mysql.spec.in 2014-07-30 19:40:33 +0000
2695@@ -85,7 +85,11 @@
2696 Summary: A very fast and reliable SQL database server
2697 Group: Applications/Databases
2698 Version: @VERSION@
2699+<<<<<<< TREE
2700 Release: 2%{?commercial:.1}%{?dist}
2701+=======
2702+Release: 4%{?dist}
2703+>>>>>>> MERGE-SOURCE
2704 License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
2705 Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
2706 URL: http://www.mysql.com/
2707@@ -211,9 +215,14 @@
2708 Provides: MySQL-client%{?_isa} = %{version}-%{release}
2709 Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
2710 %endif
2711+<<<<<<< TREE
2712 Obsoletes: MySQL-client < %{version}-%{release}
2713 Obsoletes: mariadb
2714 %if 0%{?rhel} > 5
2715+=======
2716+Obsoletes: mariadb
2717+%if 0%{?rhel} > 5
2718+>>>>>>> MERGE-SOURCE
2719 Obsoletes: mysql < %{version}-%{release}
2720 Provides: mysql = %{version}-%{release}
2721 Provides: mysql%{?_isa} = %{version}-%{release}
2722@@ -313,6 +322,7 @@
2723 Obsoletes: mysql-libs-compat < %{version}-%{release}
2724 Provides: mysql-libs-compat = %{version}-%{release}
2725 Provides: mysql-libs-compat%{?_isa} = %{version}-%{release}
2726+<<<<<<< TREE
2727 %if 0%{?commercial}
2728 Provides: MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release}
2729 Obsoletes: MySQL-shared-compat-advanced < %{version}-%{release}
2730@@ -326,6 +336,17 @@
2731 %if 0%{?rhel} > 5
2732 Obsoletes: mysql-libs < %{version}-%{release}
2733 %endif
2734+=======
2735+%if 0%{?commercial}
2736+Obsoletes: mysql-community-libs-compat < %{version}-%{release}
2737+Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
2738+%else
2739+Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
2740+%endif
2741+%if 0%{?rhel} > 5
2742+Obsoletes: mysql-libs < %{version}-%{release}
2743+%endif
2744+>>>>>>> MERGE-SOURCE
2745
2746 %description libs-compat
2747 This package contains the shared compat libraries for MySQL %{compatver} client
2748@@ -461,7 +482,14 @@
2749 make %{?_smp_mflags}
2750 popd
2751 )
2752-%endif # 0%{?compatlib}
2753+<<<<<<< TREE
2754+%endif # 0%{?compatlib}
2755+=======
2756+%endif # 0%{?compatlib}
2757+
2758+export CFLAGS="%{optflags} %{?el7:-DTAOCRYPT_DISABLE_X86ASM}"
2759+export CXXFLAGS="%{optflags} %{?el7:-DTAOCRYPT_DISABLE_X86ASM}"
2760+>>>>>>> MERGE-SOURCE
2761
2762 # Build debug versions of mysqld and libmysqld.a
2763 mkdir debug
2764@@ -472,9 +500,13 @@
2765 cmake ../%{src_dir} \
2766 -DBUILD_CONFIG=mysql_release \
2767 -DINSTALL_LAYOUT=RPM \
2768+<<<<<<< TREE
2769 -DCMAKE_BUILD_TYPE=Debug %{?el7:-DENABLE_DTRACE=OFF} \
2770 -DCMAKE_C_FLAGS="$optflags" \
2771 -DCMAKE_CXX_FLAGS="$optflags" \
2772+=======
2773+ -DCMAKE_BUILD_TYPE=Debug %{?el7:-DENABLE_DTRACE=OFF} \
2774+>>>>>>> MERGE-SOURCE
2775 -DINSTALL_LIBDIR="%{_lib}/mysql" \
2776 -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
2777 -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
2778@@ -495,9 +527,13 @@
2779 cmake ../%{src_dir} \
2780 -DBUILD_CONFIG=mysql_release \
2781 -DINSTALL_LAYOUT=RPM \
2782+<<<<<<< TREE
2783 -DCMAKE_BUILD_TYPE=RelWithDebInfo %{?el7:-DENABLE_DTRACE=OFF} \
2784 -DCMAKE_C_FLAGS="%{optflags}" \
2785 -DCMAKE_CXX_FLAGS="%{optflags}" \
2786+=======
2787+ -DCMAKE_BUILD_TYPE=RelWithDebInfo %{?el7:-DENABLE_DTRACE=OFF} \
2788+>>>>>>> MERGE-SOURCE
2789 -DINSTALL_LIBDIR="%{_lib}/mysql" \
2790 -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
2791 -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
2792@@ -881,6 +917,7 @@
2793 %endif
2794
2795 %changelog
2796+<<<<<<< TREE
2797 * Sun May 11 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-2
2798 - Increment release version to resolve upgrade conflict issue
2799
2800@@ -909,6 +946,23 @@
2801
2802 * Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.35-1
2803 - Backport changes from 5.6
2804+=======
2805+* Fri Mar 14 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-4
2806+- Resolve mysql conflict with mysql-community-client
2807+
2808+* Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-3
2809+- Resolve conflict with mysql-libs-compat
2810+
2811+* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-2
2812+- Resolve conflict issues during upgrade
2813+
2814+* Mon Feb 10 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-1
2815+- Add support for el7 (with systemd enabled)
2816+- Enable shared libmysqld by cmake option
2817+
2818+* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.35-1
2819+- Backport changes from 5.6
2820+>>>>>>> MERGE-SOURCE
2821
2822 * Mon Nov 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
2823
2824
2825=== modified file 'plugin/audit_log/CMakeLists.txt'
2826--- plugin/audit_log/CMakeLists.txt 2014-04-21 12:07:45 +0000
2827+++ plugin/audit_log/CMakeLists.txt 2014-07-30 19:40:33 +0000
2828@@ -13,5 +13,6 @@
2829 # along with this program; if not, write to the Free Software
2830 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2831
2832-MYSQL_ADD_PLUGIN(audit_log audit_log.c file_logger.c buffer.c
2833+MYSQL_ADD_PLUGIN(audit_log audit_log.c file_logger.c buffer.c audit_file.c
2834+ audit_syslog.c
2835 MODULE_ONLY MODULE_OUTPUT_NAME "audit_log")
2836
2837=== added file 'plugin/audit_log/audit_file.c'
2838--- plugin/audit_log/audit_file.c 1970-01-01 00:00:00 +0000
2839+++ plugin/audit_log/audit_file.c 2014-07-30 19:40:33 +0000
2840@@ -0,0 +1,200 @@
2841+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
2842+
2843+ This program is free software; you can redistribute it and/or
2844+ modify it under the terms of the GNU General Public License
2845+ as published by the Free Software Foundation; version 2 of
2846+ the License.
2847+
2848+ This program is distributed in the hope that it will be useful,
2849+ but WITHOUT ANY WARRANTY; without even the implied warranty of
2850+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2851+ GNU General Public License for more details.
2852+
2853+ You should have received a copy of the GNU General Public License
2854+ along with this program; if not, write to the Free Software
2855+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2856+
2857+#include "audit_handler.h"
2858+#include "buffer.h"
2859+
2860+typedef struct audit_handler_file_data_struct audit_handler_file_data_t;
2861+
2862+struct audit_handler_file_data_struct
2863+{
2864+ size_t struct_size;
2865+ LOGGER_HANDLE *logger;
2866+ logger_prolog_func_t header;
2867+ logger_epilog_func_t footer;
2868+ my_bool sync_on_write;
2869+ my_bool use_buffer;
2870+ audit_log_buffer_t *buffer;
2871+};
2872+
2873+static
2874+int audit_handler_file_write(audit_handler_t *handler,
2875+ const char *buf, size_t len);
2876+static
2877+int audit_handler_file_flush(audit_handler_t *handler);
2878+static
2879+int audit_handler_file_close(audit_handler_t *handler);
2880+static
2881+int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
2882+ const char *buf, size_t len);
2883+static
2884+int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
2885+ const char *buf, size_t len);
2886+static
2887+void audit_handler_file_set_option(audit_handler_t *handler,
2888+ audit_handler_option_t opt, void *val);
2889+
2890+static
2891+int write_callback(void *data, const char *buf, size_t len)
2892+{
2893+ audit_handler_t *handler= (audit_handler_t *) data;
2894+ audit_handler_file_data_t *hdata= (audit_handler_file_data_t*) handler->data;
2895+
2896+ DBUG_ASSERT(hdata->struct_size == sizeof(audit_handler_file_data_t));
2897+
2898+ return audit_handler_file_write_nobuf(hdata->logger, buf, len);
2899+}
2900+
2901+
2902+audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts)
2903+{
2904+ audit_handler_t *handler= (audit_handler_t*)
2905+ calloc(sizeof(audit_handler_t) + sizeof(audit_handler_file_data_t), 1);
2906+ if (handler != NULL)
2907+ {
2908+ audit_handler_file_data_t *data= (audit_handler_file_data_t*) (handler + 1);
2909+ data->struct_size= sizeof(audit_handler_file_data_t);
2910+ data->footer= opts->footer;
2911+ data->header= opts->header;
2912+ data->sync_on_write= opts->sync_on_write;
2913+ data->use_buffer= opts->use_buffer;
2914+ if (data->use_buffer)
2915+ {
2916+ data->buffer= audit_log_buffer_init(opts->buffer_size,
2917+ opts->can_drop_data,
2918+ write_callback, handler);
2919+ if (data->buffer == NULL)
2920+ goto error;
2921+ }
2922+ data->logger= logger_open(opts->name, opts->rotate_on_size,
2923+ opts->rotate_on_size ? opts->rotations : 0,
2924+ !opts->use_buffer, opts->header);
2925+ if (data->logger == NULL)
2926+ {
2927+ goto error;
2928+ }
2929+ handler->data= data;
2930+ handler->write= audit_handler_file_write;
2931+ handler->flush= audit_handler_file_flush;
2932+ handler->close= audit_handler_file_close;
2933+ handler->set_option= audit_handler_file_set_option;
2934+ goto success;
2935+error:
2936+ if (data->use_buffer)
2937+ {
2938+ free(data->buffer);
2939+ }
2940+ free(handler);
2941+ handler= NULL;
2942+ }
2943+success:
2944+ return handler;
2945+}
2946+
2947+static
2948+int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
2949+ const char *buf, size_t len)
2950+{
2951+ return logger_write(logger, buf, len);
2952+}
2953+
2954+static
2955+int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
2956+ const char *buf, size_t len)
2957+{
2958+ return audit_log_buffer_write(buffer, buf, len);
2959+}
2960+
2961+static
2962+int audit_handler_file_write(audit_handler_t *handler,
2963+ const char *buf, size_t len)
2964+{
2965+ audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
2966+ int res;
2967+
2968+ DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
2969+
2970+ if (data->use_buffer)
2971+ {
2972+ DBUG_ASSERT(data->buffer);
2973+ res= audit_handler_file_write_buf(data->buffer, buf, len);
2974+ }
2975+ else
2976+ {
2977+ DBUG_ASSERT(data->logger);
2978+ res= audit_handler_file_write_nobuf(data->logger, buf, len);
2979+
2980+ if (data->sync_on_write)
2981+ {
2982+ logger_sync(data->logger);
2983+ }
2984+ }
2985+
2986+ return res;
2987+}
2988+
2989+static
2990+int audit_handler_file_flush(audit_handler_t *handler)
2991+{
2992+ audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
2993+ LOGGER_HANDLE* logger;
2994+
2995+ DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
2996+
2997+ logger= data->logger;
2998+
2999+ return logger_reopen(logger, data->header, data->footer);
3000+}
3001+
3002+static
3003+int audit_handler_file_close(audit_handler_t *handler)
3004+{
3005+ audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
3006+ int res;
3007+ LOGGER_HANDLE* logger;
3008+
3009+ DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
3010+
3011+ logger= data->logger;
3012+
3013+ if (data->use_buffer)
3014+ {
3015+ audit_log_buffer_shutdown(data->buffer);
3016+ }
3017+
3018+ res= logger_close(logger, data->footer);
3019+
3020+ free(handler);
3021+
3022+ return res;
3023+}
3024+
3025+static
3026+void audit_handler_file_set_option(audit_handler_t *handler,
3027+ audit_handler_option_t opt, void *val)
3028+{
3029+ audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
3030+
3031+ switch (opt)
3032+ {
3033+ case OPT_ROTATIONS:
3034+ logger_set_size_limit(data->logger, *(ulonglong*)(val));
3035+ break;
3036+ case OPT_ROTATE_ON_SIZE:
3037+ logger_set_rotations(data->logger, *(ulonglong*)(val));
3038+ break;
3039+ }
3040+}
3041
3042=== added file 'plugin/audit_log/audit_handler.h'
3043--- plugin/audit_log/audit_handler.h 1970-01-01 00:00:00 +0000
3044+++ plugin/audit_log/audit_handler.h 2014-07-30 19:40:33 +0000
3045@@ -0,0 +1,116 @@
3046+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
3047+
3048+ This program is free software; you can redistribute it and/or
3049+ modify it under the terms of the GNU General Public License
3050+ as published by the Free Software Foundation; version 2 of
3051+ the License.
3052+
3053+ This program is distributed in the hope that it will be useful,
3054+ but WITHOUT ANY WARRANTY; without even the implied warranty of
3055+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3056+ GNU General Public License for more details.
3057+
3058+ You should have received a copy of the GNU General Public License
3059+ along with this program; if not, write to the Free Software
3060+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
3061+
3062+
3063+#ifndef AUDIT_HANDLER_INCLUDED
3064+#define AUDIT_HANDLER_INCLUDED
3065+
3066+#include <my_global.h>
3067+
3068+#include "logger.h"
3069+
3070+#ifdef __cplusplus
3071+extern "C" {
3072+#endif
3073+
3074+typedef struct audit_handler_struct audit_handler_t;
3075+typedef struct audit_handler_file_config_struct audit_handler_file_config_t;
3076+typedef struct audit_handler_syslog_config_struct audit_handler_syslog_config_t;
3077+typedef struct audit_handler_buffered_struct audit_handler_buffered_t;
3078+typedef void * audit_handler_data_t;
3079+
3080+
3081+typedef enum { OPT_ROTATE_ON_SIZE, OPT_ROTATIONS } audit_handler_option_t;
3082+
3083+struct audit_handler_struct
3084+{
3085+ int (*write)(audit_handler_t *, const char *, size_t);
3086+ int (*flush)(audit_handler_t *);
3087+ int (*close)(audit_handler_t *);
3088+ void (*set_option)(audit_handler_t *, audit_handler_option_t, void *);
3089+ audit_handler_data_t data;
3090+};
3091+
3092+struct audit_handler_file_config_struct
3093+{
3094+ const char *name;
3095+ size_t rotate_on_size;
3096+ size_t rotations;
3097+ my_bool sync_on_write;
3098+ my_bool use_buffer;
3099+ size_t buffer_size;
3100+ my_bool can_drop_data;
3101+ logger_prolog_func_t header;
3102+ logger_epilog_func_t footer;
3103+};
3104+
3105+struct audit_handler_syslog_config_struct
3106+{
3107+ const char *ident;
3108+ int facility;
3109+ int priority;
3110+ logger_prolog_func_t header;
3111+ logger_epilog_func_t footer;
3112+};
3113+
3114+static inline
3115+int audit_handler_write(audit_handler_t *handler, const char *buf, size_t len)
3116+{
3117+ if (handler->write != NULL)
3118+ {
3119+ return handler->write(handler, buf, len);
3120+ }
3121+ return len;
3122+}
3123+
3124+static inline
3125+int audit_handler_flush(audit_handler_t *handler)
3126+{
3127+ if (handler->flush != NULL)
3128+ {
3129+ return handler->flush(handler);
3130+ }
3131+ return 0;
3132+}
3133+
3134+static inline
3135+int audit_handler_close(audit_handler_t *handler)
3136+{
3137+ if (handler->close != NULL)
3138+ {
3139+ return handler->close(handler);
3140+ }
3141+ return 0;
3142+}
3143+
3144+static inline
3145+void audit_handler_set_option(audit_handler_t *handler,
3146+ audit_handler_option_t opt, void *val)
3147+{
3148+ if (handler->set_option != NULL)
3149+ {
3150+ handler->set_option(handler, opt, val);
3151+ }
3152+}
3153+
3154+audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts);
3155+audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts);
3156+
3157+#ifdef __cplusplus
3158+}
3159+#endif
3160+
3161+#endif
3162
3163=== modified file 'plugin/audit_log/audit_log.c'
3164--- plugin/audit_log/audit_log.c 2014-05-23 16:14:27 +0000
3165+++ plugin/audit_log/audit_log.c 2014-07-30 19:40:33 +0000
3166@@ -25,22 +25,33 @@
3167 #include <mysql_version.h>
3168 #include <mysql_com.h>
3169 #include <my_pthread.h>
3170+#include <syslog.h>
3171
3172 #include "logger.h"
3173 #include "buffer.h"
3174+#include "audit_handler.h"
3175
3176-#define PLUGIN_VERSION 0x0001
3177+#define PLUGIN_VERSION 0x0002
3178
3179
3180 enum audit_log_policy_t { ALL, NONE, LOGINS, QUERIES };
3181 enum audit_log_strategy_t
3182 { ASYNCHRONOUS, PERFORMANCE, SEMISYNCHRONOUS, SYNCHRONOUS };
3183+<<<<<<< TREE
3184 enum audit_log_format_t { OLD, NEW, JSON, CSV };
3185
3186 typedef void (*escape_buf_func_t)(const char *, size_t *, char *, size_t *);
3187
3188 static LOGGER_HANDLE *audit_file_logger= NULL;
3189 static audit_log_buffer_t *audit_log_buffer= NULL;
3190+=======
3191+enum audit_log_format_t { OLD, NEW, JSON, CSV };
3192+enum audit_log_handler_t { HANDLER_FILE, HANDLER_SYSLOG };
3193+
3194+typedef void (*escape_buf_func_t)(const char *, size_t *, char *, size_t *);
3195+
3196+static audit_handler_t *log_handler= NULL;
3197+>>>>>>> MERGE-SOURCE
3198 static ulonglong record_id= 0;
3199 static time_t log_file_time= 0;
3200 char *audit_log_file;
3201@@ -52,6 +63,43 @@
3202 ulonglong audit_log_rotations= 0;
3203 char audit_log_flush= FALSE;
3204 ulong audit_log_format= OLD;
3205+ulong audit_log_handler= HANDLER_FILE;
3206+char *audit_log_syslog_ident;
3207+char default_audit_log_syslog_ident[] = "percona-audit";
3208+ulong audit_log_syslog_facility= 0;
3209+ulong audit_log_syslog_priority= 0;
3210+
3211+
3212+static int audit_log_syslog_facility_codes[]=
3213+ { LOG_USER, LOG_AUTHPRIV, LOG_CRON, LOG_DAEMON, LOG_FTP,
3214+ LOG_KERN, LOG_LPR, LOG_MAIL, LOG_NEWS,
3215+#if (defined LOG_SECURITY)
3216+ LOG_SECURITY,
3217+#endif
3218+ LOG_SYSLOG, LOG_AUTH, LOG_UUCP, LOG_LOCAL0, LOG_LOCAL1,
3219+ LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6,
3220+ LOG_LOCAL7, 0};
3221+
3222+
3223+static const char *audit_log_syslog_facility_names[]=
3224+ { "LOG_USER", "LOG_AUTHPRIV", "LOG_CRON", "LOG_DAEMON", "LOG_FTP",
3225+ "LOG_KERN", "LOG_LPR", "LOG_MAIL", "LOG_NEWS",
3226+#if (defined LOG_SECURITY)
3227+ "LOG_SECURITY",
3228+#endif
3229+ "LOG_SYSLOG", "LOG_AUTH", "LOG_UUCP", "LOG_LOCAL0", "LOG_LOCAL1",
3230+ "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4", "LOG_LOCAL5", "LOG_LOCAL6",
3231+ "LOG_LOCAL7", 0 };
3232+
3233+
3234+static const int audit_log_syslog_priority_codes[]=
3235+ { LOG_INFO, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING,
3236+ LOG_NOTICE, LOG_EMERG, LOG_DEBUG, 0 };
3237+
3238+
3239+static const char *audit_log_syslog_priority_names[]=
3240+ { "LOG_INFO", "LOG_ALERT", "LOG_CRIT", "LOG_ERR", "LOG_WARNING",
3241+ "LOG_NOTICE", "LOG_EMERG", "LOG_DEBUG", 0 };
3242
3243
3244 static
3245@@ -228,14 +276,15 @@
3246 return out;
3247 }
3248
3249+
3250 static
3251-void logger_write_safe(LOGGER_HANDLE *log, const char *buffer, size_t size)
3252+void audit_log_write(const char *buf, size_t len)
3253 {
3254 static int write_error= 0;
3255
3256- if (log != NULL)
3257+ if (log_handler != NULL)
3258 {
3259- if (logger_write(log, buffer, size) < 0)
3260+ if (audit_handler_write(log_handler, buf, len) < 0)
3261 {
3262 if (!write_error)
3263 {
3264@@ -253,44 +302,6 @@
3265 }
3266
3267
3268-static
3269-void logger_write_safe_void(void *log, const char *buffer, size_t size)
3270-{
3271- logger_write_safe((LOGGER_HANDLE *)log, buffer, size);
3272-}
3273-
3274-
3275-static
3276-void audit_log_write_without_buffer(const char *buf, size_t len)
3277-{
3278- logger_write_safe(audit_file_logger, buf, len);
3279- if (audit_log_strategy == SYNCHRONOUS && audit_file_logger != NULL)
3280- {
3281- logger_sync(audit_file_logger);
3282- }
3283-}
3284-
3285-
3286-static
3287-void audit_log_write(const char *buf, size_t len)
3288-{
3289- switch (audit_log_strategy)
3290- {
3291- case ASYNCHRONOUS:
3292- case PERFORMANCE:
3293- if (audit_log_buffer != NULL)
3294- audit_log_buffer_write(audit_log_buffer, buf, len);
3295- break;
3296- case SEMISYNCHRONOUS:
3297- case SYNCHRONOUS:
3298- audit_log_write_without_buffer(buf, len);
3299- break;
3300- default:
3301- DBUG_ASSERT(0);
3302- }
3303-}
3304-
3305-
3306
3307 /* Defined in MySQL server */
3308 extern int orig_argc;
3309@@ -495,71 +506,146 @@
3310
3311 return my_snprintf(buf, buflen,
3312 format_string[audit_log_format],
3313- name,
3314- make_record_id(id_str, sizeof(id_str)),
3315- make_timestamp(timestamp, sizeof(timestamp), t),
3316- event->thread_id,
3317- event->status,
3318- escape_string(event->user,
3319- event->user_length,
3320- endptr, endtmp - endptr, &endptr),
3321- escape_string(event->priv_user,
3322- event->priv_user_length,
3323- endptr, endtmp - endptr, &endptr),
3324- escape_string(event->external_user,
3325- event->external_user_length,
3326- endptr, endtmp - endptr, &endptr),
3327- escape_string(event->proxy_user,
3328- event->proxy_user_length,
3329- endptr, endtmp - endptr, &endptr),
3330- escape_string(event->host,
3331- event->host_length,
3332- endptr, endtmp - endptr, &endptr),
3333- escape_string(event->user,
3334- event->user_length,
3335- endptr, endtmp - endptr, &endptr),
3336- escape_string(event->ip,
3337- event->ip_length,
3338- endptr, endtmp - endptr, &endptr),
3339- escape_string(event->database,
3340- event->database_length,
3341- endptr, endtmp - endptr, &endptr));
3342-}
3343-
3344-static
3345-size_t audit_log_header(MY_STAT *stat, char *buf, size_t buflen)
3346-{
3347- const char *format_string[] = {
3348- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
3349- "<AUDIT>\n",
3350- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
3351- "<AUDIT>\n",
3352- "",
3353- "" };
3354-
3355- log_file_time= stat->st_mtime;
3356-
3357- init_record_id(stat->st_size);
3358-
3359- return my_snprintf(buf, buflen, format_string[audit_log_format]);
3360-}
3361-
3362-
3363-static
3364-size_t audit_log_footer(char *buf, size_t buflen)
3365-{
3366- const char *format_string[] = {
3367- "</AUDIT>\n",
3368- "</AUDIT>\n",
3369- "",
3370- "" };
3371-
3372- return my_snprintf(buf, buflen, format_string[audit_log_format]);
3373-}
3374+<<<<<<< TREE
3375+ name,
3376+ make_record_id(id_str, sizeof(id_str)),
3377+ make_timestamp(timestamp, sizeof(timestamp), t),
3378+ event->thread_id,
3379+ event->status,
3380+ escape_string(event->user,
3381+ event->user_length,
3382+ endptr, endtmp - endptr, &endptr),
3383+ escape_string(event->priv_user,
3384+ event->priv_user_length,
3385+ endptr, endtmp - endptr, &endptr),
3386+ escape_string(event->external_user,
3387+ event->external_user_length,
3388+ endptr, endtmp - endptr, &endptr),
3389+ escape_string(event->proxy_user,
3390+ event->proxy_user_length,
3391+ endptr, endtmp - endptr, &endptr),
3392+ escape_string(event->host,
3393+ event->host_length,
3394+ endptr, endtmp - endptr, &endptr),
3395+ escape_string(event->user,
3396+ event->user_length,
3397+ endptr, endtmp - endptr, &endptr),
3398+ escape_string(event->ip,
3399+ event->ip_length,
3400+ endptr, endtmp - endptr, &endptr),
3401+ escape_string(event->database,
3402+ event->database_length,
3403+ endptr, endtmp - endptr, &endptr));
3404+}
3405+
3406+static
3407+size_t audit_log_header(MY_STAT *stat, char *buf, size_t buflen)
3408+{
3409+ const char *format_string[] = {
3410+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
3411+ "<AUDIT>\n",
3412+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
3413+ "<AUDIT>\n",
3414+ "",
3415+ "" };
3416+
3417+ log_file_time= stat->st_mtime;
3418+
3419+ init_record_id(stat->st_size);
3420+
3421+ return my_snprintf(buf, buflen, format_string[audit_log_format]);
3422+}
3423+
3424+
3425+static
3426+size_t audit_log_footer(char *buf, size_t buflen)
3427+{
3428+ const char *format_string[] = {
3429+ "</AUDIT>\n",
3430+ "</AUDIT>\n",
3431+ "",
3432+ "" };
3433+
3434+ return my_snprintf(buf, buflen, format_string[audit_log_format]);
3435+}
3436+=======
3437+ name,
3438+ make_record_id(id_str, sizeof(id_str)),
3439+ make_timestamp(timestamp, sizeof(timestamp), t),
3440+ event->thread_id,
3441+ event->status,
3442+ escape_string(event->user,
3443+ event->user_length,
3444+ endptr, endtmp - endptr, &endptr),
3445+ escape_string(event->priv_user,
3446+ event->priv_user_length,
3447+ endptr, endtmp - endptr, &endptr),
3448+ escape_string(event->external_user,
3449+ event->external_user_length,
3450+ endptr, endtmp - endptr, &endptr),
3451+ escape_string(event->proxy_user,
3452+ event->proxy_user_length,
3453+ endptr, endtmp - endptr, &endptr),
3454+ escape_string(event->host,
3455+ event->host_length,
3456+ endptr, endtmp - endptr, &endptr),
3457+ escape_string(event->user,
3458+ event->user_length,
3459+ endptr, endtmp - endptr, &endptr),
3460+ escape_string(event->ip,
3461+ event->ip_length,
3462+ endptr, endtmp - endptr, &endptr),
3463+ escape_string(event->database,
3464+ event->database_length,
3465+ endptr, endtmp - endptr, &endptr));
3466+}
3467+
3468+static
3469+size_t audit_log_header(MY_STAT *stat, char *buf, size_t buflen)
3470+{
3471+ const char *format_string[] = {
3472+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
3473+ "<AUDIT>\n",
3474+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
3475+ "<AUDIT>\n",
3476+ "",
3477+ "" };
3478+
3479+ log_file_time= stat->st_mtime;
3480+
3481+ init_record_id(stat->st_size);
3482+
3483+ if (buf == NULL)
3484+ {
3485+ return 0;
3486+ }
3487+
3488+ return my_snprintf(buf, buflen, format_string[audit_log_format]);
3489+}
3490+
3491+
3492+static
3493+size_t audit_log_footer(char *buf, size_t buflen)
3494+{
3495+ const char *format_string[] = {
3496+ "</AUDIT>\n",
3497+ "</AUDIT>\n",
3498+ "",
3499+ "" };
3500+
3501+ if (buf == NULL)
3502+ {
3503+ return 0;
3504+ }
3505+
3506+ return my_snprintf(buf, buflen, format_string[audit_log_format]);
3507+}
3508+>>>>>>> MERGE-SOURCE
3509
3510 static
3511 int init_new_log_file()
3512 {
3513+<<<<<<< TREE
3514 audit_file_logger= logger_open(audit_log_file, audit_log_rotate_on_size,
3515 audit_log_rotate_on_size ? audit_log_rotations : 0,
3516 audit_log_strategy >= SEMISYNCHRONOUS,
3517@@ -572,6 +658,49 @@
3518 return(1);
3519 }
3520
3521+=======
3522+ if (audit_log_handler == HANDLER_FILE)
3523+ {
3524+ audit_handler_file_config_t opts;
3525+ opts.name= audit_log_file;
3526+ opts.rotate_on_size= audit_log_rotate_on_size;
3527+ opts.rotations= audit_log_rotations;
3528+ opts.sync_on_write= audit_log_strategy == SYNCHRONOUS;
3529+ opts.use_buffer= audit_log_strategy < SEMISYNCHRONOUS;
3530+ opts.buffer_size= audit_log_buffer_size;
3531+ opts.can_drop_data= audit_log_strategy == PERFORMANCE;
3532+ opts.header= audit_log_header;
3533+ opts.footer= audit_log_footer;
3534+
3535+ log_handler= audit_handler_file_open(&opts);
3536+ if (log_handler == NULL)
3537+ {
3538+ fprintf_timestamp(stderr);
3539+ fprintf(stderr, "Cannot open file %s. ", audit_log_file);
3540+ perror("Error: ");
3541+ return(1);
3542+ }
3543+ }
3544+ else
3545+ {
3546+ audit_handler_syslog_config_t opts;
3547+ opts.facility= audit_log_syslog_facility_codes[audit_log_syslog_facility];
3548+ opts.ident= audit_log_syslog_ident;
3549+ opts.priority= audit_log_syslog_priority_codes[audit_log_syslog_priority];
3550+ opts.header= audit_log_header;
3551+ opts.footer= audit_log_footer;
3552+
3553+ log_handler= audit_handler_syslog_open(&opts);
3554+ if (log_handler == NULL)
3555+ {
3556+ fprintf_timestamp(stderr);
3557+ fprintf(stderr, "Cannot open syslog. ");
3558+ perror("Error: ");
3559+ return(1);
3560+ }
3561+ }
3562+
3563+>>>>>>> MERGE-SOURCE
3564 return(0);
3565 }
3566
3567@@ -579,12 +708,19 @@
3568 static
3569 int reopen_log_file()
3570 {
3571+<<<<<<< TREE
3572 if (logger_reopen(audit_file_logger, audit_log_header, audit_log_footer))
3573+=======
3574+ if (log_handler != NULL)
3575+>>>>>>> MERGE-SOURCE
3576 {
3577- fprintf_timestamp(stderr);
3578- fprintf(stderr, "Cannot open file %s. ", audit_log_file);
3579- perror("Error: ");
3580- return(1);
3581+ if (audit_handler_flush(log_handler))
3582+ {
3583+ fprintf_timestamp(stderr);
3584+ fprintf(stderr, "Cannot open file %s. ", audit_log_file);
3585+ perror("Error: ");
3586+ return(1);
3587+ }
3588 }
3589
3590 return(0);
3591@@ -592,6 +728,7 @@
3592
3593
3594 static
3595+<<<<<<< TREE
3596 void close_log_file()
3597 {
3598 if (audit_file_logger != NULL)
3599@@ -600,6 +737,8 @@
3600
3601
3602 static
3603+=======
3604+>>>>>>> MERGE-SOURCE
3605 int audit_log_plugin_init(void *arg __attribute__((unused)))
3606 {
3607 char buf[1024];
3608@@ -610,13 +749,6 @@
3609 if (init_new_log_file())
3610 return(1);
3611
3612- if (audit_log_strategy < SEMISYNCHRONOUS)
3613- {
3614- audit_log_buffer= audit_log_buffer_init(audit_log_buffer_size,
3615- audit_log_strategy == PERFORMANCE, logger_write_safe_void,
3616- audit_file_logger);
3617- }
3618-
3619 len= audit_log_audit_record(buf, sizeof(buf), "Audit", time(NULL));
3620 audit_log_write(buf, len);
3621
3622@@ -633,9 +765,13 @@
3623 len= audit_log_audit_record(buf, sizeof(buf), "NoAudit", time(NULL));
3624 audit_log_write(buf, len);
3625
3626+<<<<<<< TREE
3627 if (audit_log_buffer != NULL)
3628 audit_log_buffer_shutdown(audit_log_buffer);
3629 close_log_file();
3630+=======
3631+ audit_handler_close(log_handler);
3632+>>>>>>> MERGE-SOURCE
3633
3634 return(0);
3635 }
3636@@ -729,8 +865,8 @@
3637
3638 static TYPELIB audit_log_policy_typelib=
3639 {
3640- array_elements(audit_log_policy_names) - 1, "audit_log_policy_typelib",
3641- audit_log_policy_names, NULL
3642+ array_elements(audit_log_policy_names) - 1, "audit_log_policy_typelib",
3643+ audit_log_policy_names, NULL
3644 };
3645
3646 static MYSQL_SYSVAR_ENUM(policy, audit_log_policy, PLUGIN_VAR_RQCMDARG,
3647@@ -742,21 +878,22 @@
3648 { "ASYNCHRONOUS", "PERFORMANCE", "SEMISYNCHRONOUS", "SYNCHRONOUS", 0 };
3649 static TYPELIB audit_log_strategy_typelib=
3650 {
3651- array_elements(audit_log_strategy_names) - 1, "audit_log_strategy_typelib",
3652- audit_log_strategy_names, NULL
3653+ array_elements(audit_log_strategy_names) - 1, "audit_log_strategy_typelib",
3654+ audit_log_strategy_names, NULL
3655 };
3656
3657 static MYSQL_SYSVAR_ENUM(strategy, audit_log_strategy,
3658 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
3659- "The logging method used by the audit log plugin.", NULL, NULL,
3660+ "The logging method used by the audit log plugin, "
3661+ "if FILE handler is used.", NULL, NULL,
3662 ASYNCHRONOUS, &audit_log_strategy_typelib);
3663
3664 static const char *audit_log_format_names[]=
3665 { "OLD", "NEW", "JSON", "CSV", 0 };
3666 static TYPELIB audit_log_format_typelib=
3667 {
3668- array_elements(audit_log_format_names) - 1, "audit_log_format_typelib",
3669- audit_log_format_names, NULL
3670+ array_elements(audit_log_format_names) - 1, "audit_log_format_typelib",
3671+ audit_log_format_names, NULL
3672 };
3673
3674 static MYSQL_SYSVAR_ENUM(format, audit_log_format,
3675@@ -764,9 +901,23 @@
3676 "The audit log file format.", NULL, NULL,
3677 ASYNCHRONOUS, &audit_log_format_typelib);
3678
3679+static const char *audit_log_handler_names[]=
3680+ { "FILE", "SYSLOG", 0 };
3681+static TYPELIB audit_log_handler_typelib=
3682+{
3683+ array_elements(audit_log_handler_names) - 1, "audit_log_handler_typelib",
3684+ audit_log_handler_names, NULL
3685+};
3686+
3687+static MYSQL_SYSVAR_ENUM(handler, audit_log_handler,
3688+ PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
3689+ "The audit log handler.", NULL, NULL,
3690+ HANDLER_FILE, &audit_log_handler_typelib);
3691+
3692 static MYSQL_SYSVAR_ULONGLONG(buffer_size, audit_log_buffer_size,
3693 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
3694- "The size of the buffer for asynchronous logging.",
3695+ "The size of the buffer for asynchronous logging, "
3696+ "if FILE handler is used.",
3697 NULL, NULL, 1048576UL, 4096UL, ULONGLONG_MAX, 4096UL);
3698
3699 static
3700@@ -778,13 +929,15 @@
3701 {
3702 ulonglong new_val= *(ulonglong *)(save);
3703
3704- if (audit_file_logger)
3705- logger_set_size_limit(audit_file_logger, new_val);
3706+ if (log_handler != NULL)
3707+ audit_handler_set_option(log_handler, OPT_ROTATE_ON_SIZE, &new_val);
3708+
3709+ audit_log_rotate_on_size= new_val;
3710 }
3711
3712 static MYSQL_SYSVAR_ULONGLONG(rotate_on_size, audit_log_rotate_on_size,
3713 PLUGIN_VAR_RQCMDARG,
3714- "Maximum size of the log to start the rotation.",
3715+ "Maximum size of the log to start the rotation, if FILE handler is used.",
3716 NULL, audit_log_rotate_on_size_update, 0UL, 0UL, ULONGLONG_MAX, 4096UL);
3717
3718 static
3719@@ -796,13 +949,15 @@
3720 {
3721 ulonglong new_val= *(ulonglong *)(save);
3722
3723- if (audit_file_logger)
3724- logger_set_rotations(audit_file_logger, new_val);
3725+ if (log_handler != NULL)
3726+ audit_handler_set_option(log_handler, OPT_ROTATIONS, &new_val);
3727+
3728+ audit_log_rotations= new_val;
3729 }
3730
3731 static MYSQL_SYSVAR_ULONGLONG(rotations, audit_log_rotations,
3732 PLUGIN_VAR_RQCMDARG,
3733- "Maximum number of rotations to keep.",
3734+ "Maximum number of rotations to keep, if FILE handler is used.",
3735 NULL, audit_log_rotations_update, 0UL, 0UL, 999UL, 1UL);
3736
3737 static
3738@@ -826,6 +981,39 @@
3739 PLUGIN_VAR_OPCMDARG, "Flush the log file.", NULL,
3740 audit_log_flush_update, 0);
3741
3742+static MYSQL_SYSVAR_STR(syslog_ident, audit_log_syslog_ident,
3743+ PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
3744+ "The string that will be prepended to each log message, "
3745+ "if SYSLOG handler is used.",
3746+ NULL, NULL, default_audit_log_syslog_ident);
3747+
3748+static TYPELIB audit_log_syslog_facility_typelib=
3749+{
3750+ array_elements(audit_log_syslog_facility_names) - 1,
3751+ "audit_log_syslog_facility_typelib",
3752+ audit_log_syslog_facility_names, NULL
3753+};
3754+
3755+static MYSQL_SYSVAR_ENUM(syslog_facility, audit_log_syslog_facility,
3756+ PLUGIN_VAR_RQCMDARG,
3757+ "The syslog facility to assign to messages, if SYSLOG handler is used.",
3758+ NULL, NULL, 0,
3759+ &audit_log_syslog_facility_typelib);
3760+
3761+static TYPELIB audit_log_syslog_priority_typelib=
3762+{
3763+ array_elements(audit_log_syslog_priority_names) - 1,
3764+ "audit_log_syslog_priority_typelib",
3765+ audit_log_syslog_priority_names, NULL
3766+};
3767+
3768+static MYSQL_SYSVAR_ENUM(syslog_priority, audit_log_syslog_priority,
3769+ PLUGIN_VAR_RQCMDARG,
3770+ "Priority to be assigned to all messages written to syslog.",
3771+ NULL, NULL, 0,
3772+ &audit_log_syslog_priority_typelib);
3773+
3774+
3775 static struct st_mysql_sys_var* audit_log_system_variables[] =
3776 {
3777 MYSQL_SYSVAR(file),
3778@@ -836,6 +1024,10 @@
3779 MYSQL_SYSVAR(rotate_on_size),
3780 MYSQL_SYSVAR(rotations),
3781 MYSQL_SYSVAR(flush),
3782+ MYSQL_SYSVAR(handler),
3783+ MYSQL_SYSVAR(syslog_ident),
3784+ MYSQL_SYSVAR(syslog_priority),
3785+ MYSQL_SYSVAR(syslog_facility),
3786 NULL
3787 };
3788
3789
3790=== added file 'plugin/audit_log/audit_syslog.c'
3791--- plugin/audit_log/audit_syslog.c 1970-01-01 00:00:00 +0000
3792+++ plugin/audit_log/audit_syslog.c 2014-07-30 19:40:33 +0000
3793@@ -0,0 +1,91 @@
3794+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
3795+
3796+ This program is free software; you can redistribute it and/or
3797+ modify it under the terms of the GNU General Public License
3798+ as published by the Free Software Foundation; version 2 of
3799+ the License.
3800+
3801+ This program is distributed in the hope that it will be useful,
3802+ but WITHOUT ANY WARRANTY; without even the implied warranty of
3803+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3804+ GNU General Public License for more details.
3805+
3806+ You should have received a copy of the GNU General Public License
3807+ along with this program; if not, write to the Free Software
3808+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
3809+
3810+#include <syslog.h>
3811+#include <string.h>
3812+#include "audit_handler.h"
3813+
3814+typedef struct audit_handler_syslog_data_struct audit_handler_syslog_data_t;
3815+
3816+struct audit_handler_syslog_data_struct
3817+{
3818+ size_t struct_size;
3819+ int priority;
3820+ logger_prolog_func_t header;
3821+ logger_epilog_func_t footer;
3822+};
3823+
3824+int audit_handler_syslog_write(audit_handler_t *handler,
3825+ const char *buf, size_t len);
3826+int audit_handler_syslog_flush(audit_handler_t *handler);
3827+int audit_handler_syslog_close(audit_handler_t *handler);
3828+
3829+
3830+audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts)
3831+{
3832+ audit_handler_t *handler= (audit_handler_t*)
3833+ calloc(sizeof(audit_handler_t) + sizeof(audit_handler_syslog_data_t), 1);
3834+ if (handler != NULL)
3835+ {
3836+ audit_handler_syslog_data_t *data=
3837+ (audit_handler_syslog_data_t*) (handler + 1);
3838+ MY_STAT stat_arg;
3839+
3840+ data->struct_size= sizeof(audit_handler_syslog_data_t);
3841+ data->priority= opts->priority;
3842+ data->header= opts->header;
3843+ data->footer= opts->footer;
3844+ openlog(opts->ident, 0, opts->facility);
3845+ memset(&stat_arg, 0, sizeof(stat_arg));
3846+ opts->header(&stat_arg, NULL, 0);
3847+ handler->data= data;
3848+ handler->write= audit_handler_syslog_write;
3849+ handler->flush= audit_handler_syslog_flush;
3850+ handler->close= audit_handler_syslog_close;
3851+ }
3852+ return handler;
3853+}
3854+
3855+int audit_handler_syslog_write(audit_handler_t *handler,
3856+ const char *buf, size_t len)
3857+{
3858+ audit_handler_syslog_data_t *data=
3859+ (audit_handler_syslog_data_t*) handler->data;
3860+ DBUG_ASSERT(data->struct_size == sizeof(audit_handler_syslog_data_t));
3861+ syslog(data->priority, "%s", buf);
3862+ return len;
3863+}
3864+
3865+int audit_handler_syslog_flush(audit_handler_t *handler)
3866+{
3867+ audit_handler_syslog_data_t *data=
3868+ (audit_handler_syslog_data_t*) handler->data;
3869+ MY_STAT stat_arg;
3870+ memset(&stat_arg, 0, sizeof(stat_arg));
3871+ data->header(&stat_arg, NULL, 0);
3872+ data->footer(NULL, 0);
3873+ return 0;
3874+}
3875+
3876+int audit_handler_syslog_close(audit_handler_t *handler)
3877+{
3878+ audit_handler_syslog_data_t *data=
3879+ (audit_handler_syslog_data_t*) handler->data;
3880+ data->footer(NULL, 0);
3881+ closelog();
3882+ free(handler);
3883+ return 0;
3884+}
3885
3886=== modified file 'plugin/audit_log/buffer.h'
3887--- plugin/audit_log/buffer.h 2014-04-21 12:07:45 +0000
3888+++ plugin/audit_log/buffer.h 2014-07-30 19:40:33 +0000
3889@@ -20,13 +20,22 @@
3890
3891 #include <string.h> // for size_t
3892
3893+#ifdef __cplusplus
3894+extern "C" {
3895+#endif
3896+
3897 typedef struct audit_log_buffer audit_log_buffer_t;
3898
3899-typedef void (*audit_log_write_func)(void *data, const char *buf, size_t len);
3900+typedef int (*audit_log_write_func)(void *data, const char *buf, size_t len);
3901
3902 audit_log_buffer_t *audit_log_buffer_init(size_t size, int drop_if_full,
3903 audit_log_write_func write_func, void *data);
3904 void audit_log_buffer_shutdown(audit_log_buffer_t *log);
3905-int audit_log_buffer_write(audit_log_buffer_t *log, const char *buf, size_t len);
3906+int audit_log_buffer_write(audit_log_buffer_t *log,
3907+ const char *buf, size_t len);
3908+
3909+#ifdef __cplusplus
3910+}
3911+#endif
3912
3913 #endif
3914
3915=== modified file 'plugin/audit_log/logger.h'
3916--- plugin/audit_log/logger.h 2014-05-23 16:14:27 +0000
3917+++ plugin/audit_log/logger.h 2014-07-30 19:40:33 +0000
3918@@ -60,8 +60,13 @@
3919 #endif
3920
3921 typedef struct logger_handle_st LOGGER_HANDLE;
3922+<<<<<<< TREE
3923 typedef size_t (logger_prolog_func_t)(MY_STAT *, char *buf, size_t buflen);
3924 typedef size_t (logger_epilog_func_t)(char *buf, size_t buflen);
3925+=======
3926+typedef size_t (*logger_prolog_func_t)(MY_STAT *, char *buf, size_t buflen);
3927+typedef size_t (*logger_epilog_func_t)(char *buf, size_t buflen);
3928+>>>>>>> MERGE-SOURCE
3929
3930 void logger_init_mutexes();
3931 LOGGER_HANDLE *logger_open(const char *path,
3932
3933=== modified file 'storage/innobase/include/univ.i'
3934--- storage/innobase/include/univ.i 2014-06-30 15:18:39 +0000
3935+++ storage/innobase/include/univ.i 2014-07-30 19:40:33 +0000
3936@@ -64,7 +64,11 @@
3937 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
3938
3939 #ifndef PERCONA_INNODB_VERSION
3940+<<<<<<< TREE
3941 #define PERCONA_INNODB_VERSION 35.2
3942+=======
3943+#define PERCONA_INNODB_VERSION 35.1
3944+>>>>>>> MERGE-SOURCE
3945 #endif
3946
3947 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION

Subscribers

People subscribed via source and target branches