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
cd2da606
Commit
cd2da606
authored
Mar 06, 2020
by
Michael Erickson
Committed by
Sergei Petrunia
Mar 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove my_error and my_printf_error
parent
4c308dd2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
25 deletions
+6
-25
storage/xpand/ha_xpand.cc
storage/xpand/ha_xpand.cc
+1
-1
storage/xpand/xpand_connection.cc
storage/xpand/xpand_connection.cc
+5
-24
No files found.
storage/xpand/ha_xpand.cc
View file @
cd2da606
...
...
@@ -112,7 +112,7 @@ static void update_hosts(MYSQL_THD thd, struct st_mysql_sys_var *var,
int
error_code
=
list
->
fill
(
from_save
);
if
(
error_code
)
{
my_free
(
list
);
my_printf_error
(
error_code
,
"Unhandled error setting xpand hostlist"
,
MYF
(
0
)
);
sql_print_error
(
"Unhandled error %d setting xpand hostlist"
,
error_code
);
DBUG_VOID_RETURN
;
}
...
...
storage/xpand/xpand_connection.cc
View file @
cd2da606
...
...
@@ -149,9 +149,6 @@ int xpand_connection::connect()
break
;
}
mysql_rwlock_unlock
(
&
xpand_hosts_lock
);
if
(
error_code
)
my_error
(
error_code
,
MYF
(
0
),
"clustrix"
);
DBUG_RETURN
(
error_code
);
}
...
...
@@ -272,8 +269,6 @@ int xpand_connection::begin_command(uchar command)
int
xpand_connection
::
send_command
()
{
my_bool
com_error
;
/*
Please note:
* The transaction state is set before the command is sent because rolling
...
...
@@ -289,32 +284,18 @@ int xpand_connection::send_command()
*/
trans_state
=
XPAND_TRANS_STARTED
;
com_error
=
simple_command
(
&
xpand_net
,
if
(
simple_command
(
&
xpand_net
,
(
enum_server_command
)
XPAND_SERVER_REQUEST
,
command_buffer
,
command_length
,
TRUE
);
if
(
com_error
)
{
int
error_code
=
mysql_errno
(
&
xpand_net
);
my_printf_error
(
error_code
,
"Xpand error: %s"
,
MYF
(
0
),
mysql_error
(
&
xpand_net
));
return
error_code
;
}
command_buffer
,
command_length
,
TRUE
))
return
mysql_errno
(
&
xpand_net
);
return
0
;
}
int
xpand_connection
::
read_query_response
()
{
my_bool
comerr
=
xpand_net
.
methods
->
read_query_result
(
&
xpand_net
);
int
error_code
=
0
;
if
(
comerr
)
{
if
(
xpand_net
.
methods
->
read_query_result
(
&
xpand_net
))
error_code
=
mysql_errno
(
&
xpand_net
);
my_printf_error
(
error_code
,
"Xpand error: %s"
,
MYF
(
0
),
mysql_error
(
&
xpand_net
));
}
auto_commit_closed
();
return
error_code
;
}
...
...
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