Merge lp:~gaul/mysql-server/general-log-help-text into lp:mysql-server

Proposed by Andrew Gaul
Status: Merged
Merged at revision: 7831
Proposed branch: lp:~gaul/mysql-server/general-log-help-text
Merge into: lp:mysql-server
Diff against target: 12 lines (+1/-1)
1 file modified
sql/sys_vars.cc (+1/-1)
To merge this branch: bzr merge lp:~gaul/mysql-server/general-log-help-text
Reviewer Review Type Date Requested Status
Oracle/MySQL Engineering Pending
Review via email: mp+202018@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Gaul (gaul) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sql/sys_vars.cc'
--- sql/sys_vars.cc 2013-11-01 10:06:11 +0000
+++ sql/sys_vars.cc 2014-01-16 23:16:55 +0000
@@ -3957,7 +3957,7 @@
3957}3957}
3958static Sys_var_mybool Sys_general_log(3958static Sys_var_mybool Sys_general_log(
3959 "general_log", "Log connections and queries to a table or log file. "3959 "general_log", "Log connections and queries to a table or log file. "
3960 "Defaults logging to a file hostname.log or a table mysql.general_log"3960 "Defaults logging to a file hostname.log or a table mysql.general_log "
3961 "if --log-output=TABLE is used",3961 "if --log-output=TABLE is used",
3962 GLOBAL_VAR(opt_general_log), CMD_LINE(OPT_ARG),3962 GLOBAL_VAR(opt_general_log), CMD_LINE(OPT_ARG),
3963 DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),3963 DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),