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
c0c62196
Commit
c0c62196
authored
Jan 26, 2019
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed \n from sql_print_error()
parent
d0bfa4af
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
19 deletions
+19
-19
sql/ha_partition.cc
sql/ha_partition.cc
+2
-2
sql/handle_connections_win.cc
sql/handle_connections_win.cc
+2
-2
sql/log.cc
sql/log.cc
+3
-3
sql/mysqld.cc
sql/mysqld.cc
+11
-11
sql/threadpool_generic.cc
sql/threadpool_generic.cc
+1
-1
No files found.
sql/ha_partition.cc
View file @
c0c62196
...
@@ -1367,7 +1367,7 @@ bool print_admin_msg(THD* thd, uint len,
...
@@ -1367,7 +1367,7 @@ bool print_admin_msg(THD* thd, uint len,
protocol
->
store
(
msgbuf
,
msg_length
,
system_charset_info
);
protocol
->
store
(
msgbuf
,
msg_length
,
system_charset_info
);
if
(
protocol
->
write
())
if
(
protocol
->
write
())
{
{
sql_print_error
(
"Failed on my_net_write, writing to stderr instead: %s
\n
"
,
sql_print_error
(
"Failed on my_net_write, writing to stderr instead: %s"
,
msgbuf
);
msgbuf
);
goto
err
;
goto
err
;
}
}
...
@@ -9778,7 +9778,7 @@ void ha_partition::print_error(int error, myf errflag)
...
@@ -9778,7 +9778,7 @@ void ha_partition::print_error(int error, myf errflag)
append_row_to_str
(
str
);
append_row_to_str
(
str
);
/* Log this error, so the DBA can notice it and fix it! */
/* Log this error, so the DBA can notice it and fix it! */
sql_print_error
(
"Table '%-192s' corrupted: row in wrong partition: %s
\n
"
sql_print_error
(
"Table '%-192s' corrupted: row in wrong partition: %s"
"Please REPAIR the table!"
,
"Please REPAIR the table!"
,
table
->
s
->
table_name
.
str
,
table
->
s
->
table_name
.
str
,
str
.
c_ptr_safe
());
str
.
c_ptr_safe
());
...
...
sql/handle_connections_win.cc
View file @
c0c62196
...
@@ -353,7 +353,7 @@ struct Pipe_Listener : public Listener
...
@@ -353,7 +353,7 @@ struct Pipe_Listener : public Listener
if
(
pipe_handle
==
INVALID_HANDLE_VALUE
)
if
(
pipe_handle
==
INVALID_HANDLE_VALUE
)
{
{
sql_perror
(
"Create named pipe failed"
);
sql_perror
(
"Create named pipe failed"
);
sql_print_error
(
"Aborting
\n
"
);
sql_print_error
(
"Aborting"
);
exit
(
1
);
exit
(
1
);
}
}
first_instance
=
false
;
first_instance
=
false
;
...
...
sql/log.cc
View file @
c0c62196
...
@@ -6088,7 +6088,7 @@ MYSQL_BIN_LOG::write_state_to_file()
...
@@ -6088,7 +6088,7 @@ MYSQL_BIN_LOG::write_state_to_file()
goto
end
;
goto
end
;
err:
err:
sql_print_error
(
"Error writing binlog state to file '%s'.
\n
"
,
buf
);
sql_print_error
(
"Error writing binlog state to file '%s'."
,
buf
);
if
(
log_inited
)
if
(
log_inited
)
end_io_cache
(
&
cache
);
end_io_cache
(
&
cache
);
end:
end:
...
@@ -6148,7 +6148,7 @@ MYSQL_BIN_LOG::read_state_from_file()
...
@@ -6148,7 +6148,7 @@ MYSQL_BIN_LOG::read_state_from_file()
goto
end
;
goto
end
;
err:
err:
sql_print_error
(
"Error reading binlog GTID state from file '%s'.
\n
"
,
buf
);
sql_print_error
(
"Error reading binlog GTID state from file '%s'."
,
buf
);
end:
end:
if
(
log_inited
)
if
(
log_inited
)
end_io_cache
(
&
cache
);
end_io_cache
(
&
cache
);
...
@@ -7272,7 +7272,7 @@ MYSQL_BIN_LOG::write_binlog_checkpoint_event_already_locked(const char *name_arg
...
@@ -7272,7 +7272,7 @@ MYSQL_BIN_LOG::write_binlog_checkpoint_event_already_locked(const char *name_arg
ability to do crash recovery - crash recovery will just have to scan a
ability to do crash recovery - crash recovery will just have to scan a
bit more of the binlog than strictly necessary.
bit more of the binlog than strictly necessary.
*/
*/
sql_print_error
(
"Failed to write binlog checkpoint event to binary log
\n
"
);
sql_print_error
(
"Failed to write binlog checkpoint event to binary log"
);
}
}
offset
=
my_b_tell
(
&
log_file
);
offset
=
my_b_tell
(
&
log_file
);
...
...
sql/mysqld.cc
View file @
c0c62196
...
@@ -1305,10 +1305,10 @@ void Buffered_log::print()
...
@@ -1305,10 +1305,10 @@ void Buffered_log::print()
switch
(
m_level
)
switch
(
m_level
)
{
{
case
ERROR_LEVEL
:
case
ERROR_LEVEL
:
sql_print_error
(
"Buffered error: %s
\n
"
,
m_message
.
c_ptr_safe
());
sql_print_error
(
"Buffered error: %s"
,
m_message
.
c_ptr_safe
());
break
;
break
;
case
WARNING_LEVEL
:
case
WARNING_LEVEL
:
sql_print_warning
(
"Buffered warning: %s
\n
"
,
m_message
.
c_ptr_safe
());
sql_print_warning
(
"Buffered warning: %s"
,
m_message
.
c_ptr_safe
());
break
;
break
;
case
INFORMATION_LEVEL
:
case
INFORMATION_LEVEL
:
/*
/*
...
@@ -2032,7 +2032,7 @@ extern "C" void unireg_abort(int exit_code)
...
@@ -2032,7 +2032,7 @@ extern "C" void unireg_abort(int exit_code)
if
(
opt_help
)
if
(
opt_help
)
usage
();
usage
();
if
(
exit_code
)
if
(
exit_code
)
sql_print_error
(
"Aborting
\n
"
);
sql_print_error
(
"Aborting"
);
/* Don't write more notes to the log to not hide error message */
/* Don't write more notes to the log to not hide error message */
disable_log_notes
=
1
;
disable_log_notes
=
1
;
...
@@ -8645,7 +8645,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
...
@@ -8645,7 +8645,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
if
(
!
(
p
=
strstr
(
argument
,
"->"
)))
if
(
!
(
p
=
strstr
(
argument
,
"->"
)))
{
{
sql_print_error
(
"Bad syntax in replicate-rewrite-db - missing '->'!
\n
"
);
sql_print_error
(
"Bad syntax in replicate-rewrite-db - missing '->'!"
);
return
1
;
return
1
;
}
}
val
=
p
--
;
val
=
p
--
;
...
@@ -8653,7 +8653,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
...
@@ -8653,7 +8653,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
*
p
--
=
0
;
*
p
--
=
0
;
if
(
p
==
argument
)
if
(
p
==
argument
)
{
{
sql_print_error
(
"Bad syntax in replicate-rewrite-db - empty FROM db!
\n
"
);
sql_print_error
(
"Bad syntax in replicate-rewrite-db - empty FROM db!"
);
return
1
;
return
1
;
}
}
*
val
=
0
;
*
val
=
0
;
...
@@ -8662,7 +8662,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
...
@@ -8662,7 +8662,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
val
++
;
val
++
;
if
(
!*
val
)
if
(
!*
val
)
{
{
sql_print_error
(
"Bad syntax in replicate-rewrite-db - empty TO db!
\n
"
);
sql_print_error
(
"Bad syntax in replicate-rewrite-db - empty TO db!"
);
return
1
;
return
1
;
}
}
...
@@ -8691,7 +8691,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
...
@@ -8691,7 +8691,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
{
{
if
(
cur_rpl_filter
->
add_do_table
(
argument
))
if
(
cur_rpl_filter
->
add_do_table
(
argument
))
{
{
sql_print_error
(
"Could not add do table rule '%s'!
\n
"
,
argument
);
sql_print_error
(
"Could not add do table rule '%s'!"
,
argument
);
return
1
;
return
1
;
}
}
break
;
break
;
...
@@ -8700,7 +8700,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
...
@@ -8700,7 +8700,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
{
{
if
(
cur_rpl_filter
->
add_wild_do_table
(
argument
))
if
(
cur_rpl_filter
->
add_wild_do_table
(
argument
))
{
{
sql_print_error
(
"Could not add do table rule '%s'!
\n
"
,
argument
);
sql_print_error
(
"Could not add do table rule '%s'!"
,
argument
);
return
1
;
return
1
;
}
}
break
;
break
;
...
@@ -8709,7 +8709,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
...
@@ -8709,7 +8709,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
{
{
if
(
cur_rpl_filter
->
add_wild_ignore_table
(
argument
))
if
(
cur_rpl_filter
->
add_wild_ignore_table
(
argument
))
{
{
sql_print_error
(
"Could not add ignore table rule '%s'!
\n
"
,
argument
);
sql_print_error
(
"Could not add ignore table rule '%s'!"
,
argument
);
return
1
;
return
1
;
}
}
break
;
break
;
...
@@ -8718,7 +8718,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
...
@@ -8718,7 +8718,7 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
{
{
if
(
cur_rpl_filter
->
add_ignore_table
(
argument
))
if
(
cur_rpl_filter
->
add_ignore_table
(
argument
))
{
{
sql_print_error
(
"Could not add ignore table rule '%s'!
\n
"
,
argument
);
sql_print_error
(
"Could not add ignore table rule '%s'!"
,
argument
);
return
1
;
return
1
;
}
}
break
;
break
;
...
@@ -9075,7 +9075,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
...
@@ -9075,7 +9075,7 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
if
(
ft_boolean_check_syntax_string
((
uchar
*
)
ft_boolean_syntax
))
if
(
ft_boolean_check_syntax_string
((
uchar
*
)
ft_boolean_syntax
))
{
{
sql_print_error
(
"Invalid ft-boolean-syntax string: %s
\n
"
,
sql_print_error
(
"Invalid ft-boolean-syntax string: %s"
,
ft_boolean_syntax
);
ft_boolean_syntax
);
return
1
;
return
1
;
}
}
...
...
sql/threadpool_generic.cc
View file @
c0c62196
...
@@ -1694,7 +1694,7 @@ int TP_pool_generic::set_pool_size(uint size)
...
@@ -1694,7 +1694,7 @@ int TP_pool_generic::set_pool_size(uint size)
success
=
(
group
->
pollfd
!=
INVALID_HANDLE_VALUE
);
success
=
(
group
->
pollfd
!=
INVALID_HANDLE_VALUE
);
if
(
!
success
)
if
(
!
success
)
{
{
sql_print_error
(
"io_poll_create() failed, errno=%d
\n
"
,
errno
);
sql_print_error
(
"io_poll_create() failed, errno=%d"
,
errno
);
}
}
}
}
mysql_mutex_unlock
(
&
group
->
mutex
);
mysql_mutex_unlock
(
&
group
->
mutex
);
...
...
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