Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
3ba8c176
Commit
3ba8c176
authored
Feb 23, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix badly spelled symbol.
parent
a00749a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
sql/set_var.cc
sql/set_var.cc
+3
-3
sql/share/errmsg.txt
sql/share/errmsg.txt
+1
-1
No files found.
sql/set_var.cc
View file @
3ba8c176
...
...
@@ -2089,7 +2089,7 @@ bool sys_var_character_set_server::check(THD *thd, set_var *var)
(
mysql_bin_log
.
is_open
()
||
active_mi
->
slave_running
||
active_mi
->
rli
.
slave_running
))
{
my_error
(
ER_LOGING_PROHIBIT_CHANGING_OF
,
MYF
(
0
),
my_error
(
ER_LOG
G
ING_PROHIBIT_CHANGING_OF
,
MYF
(
0
),
"character set, collation"
);
return
1
;
}
...
...
@@ -2196,7 +2196,7 @@ bool sys_var_collation_server::check(THD *thd, set_var *var)
(
mysql_bin_log
.
is_open
()
||
active_mi
->
slave_running
||
active_mi
->
rli
.
slave_running
))
{
my_error
(
ER_LOGING_PROHIBIT_CHANGING_OF
,
MYF
(
0
),
my_error
(
ER_LOG
G
ING_PROHIBIT_CHANGING_OF
,
MYF
(
0
),
"character set, collation"
);
return
1
;
}
...
...
@@ -2546,7 +2546,7 @@ bool sys_var_thd_time_zone::check(THD *thd, set_var *var)
(
mysql_bin_log
.
is_open
()
||
active_mi
->
slave_running
||
active_mi
->
rli
.
slave_running
))
{
my_error
(
ER_LOGING_PROHIBIT_CHANGING_OF
,
MYF
(
0
),
"time zone"
);
my_error
(
ER_LOG
G
ING_PROHIBIT_CHANGING_OF
,
MYF
(
0
),
"time zone"
);
return
1
;
}
#endif
...
...
sql/share/errmsg.txt
View file @
3ba8c176
...
...
@@ -5276,7 +5276,7 @@ ER_NO_GROUP_FOR_PROC
eng "Select must have a group with this procedure"
ER_ORDER_WITH_PROC
eng "Can't use ORDER clause with this procedure"
ER_LOGING_PROHIBIT_CHANGING_OF
ER_LOG
G
ING_PROHIBIT_CHANGING_OF
eng "Binary logging and replication forbid changing the global server %s"
ER_NO_FILE_MAPPING
eng "Can't map file: %-.64s, errno: %d"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment