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
225d009c
Commit
225d009c
authored
Nov 21, 2005
by
bar@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.b14255
parents
435c2ba6
519139b6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
config/ac-macros/zlib.m4
config/ac-macros/zlib.m4
+1
-1
sql/ha_federated.cc
sql/ha_federated.cc
+2
-2
No files found.
config/ac-macros/zlib.m4
View file @
225d009c
...
...
@@ -19,7 +19,7 @@ INCLUDES="$INCLUDES $ZLIB_INCLUDES"
LIBS="$LIBS $ZLIB_LIBS"
AC_CACHE_VAL([mysql_cv_compress],
[AC_TRY_LINK([#include <zlib.h>],
[return
compress(0, (unsigned long*) 0, "", 0
);],
[return
zlibCompileFlags(
);],
[mysql_cv_compress="yes"
AC_MSG_RESULT([ok])],
[mysql_cv_compress="no"])
...
...
sql/ha_federated.cc
View file @
225d009c
...
...
@@ -2615,7 +2615,7 @@ int ha_federated::stash_remote_error()
{
DBUG_ENTER
(
"ha_federated::stash_remote_error()"
);
remote_error_number
=
mysql_errno
(
mysql
);
my_snprintf
(
remote_error_buf
,
FEDERATED_QUERY_BUFFER_SIZE
,
my_snprintf
(
remote_error_buf
,
sizeof
(
remote_error_buf
),
"%s"
,
mysql_error
(
mysql
));
DBUG_RETURN
(
HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM
);
}
...
...
@@ -2630,7 +2630,7 @@ bool ha_federated::get_error_message(int error, String* buf)
buf
->
append
(
"Error on remote system: "
);
buf
->
qs_append
(
remote_error_number
);
buf
->
append
(
": "
);
buf
->
append
(
remote_error_buf
,
FEDERATED_QUERY_BUFFER_SIZE
);
buf
->
append
(
remote_error_buf
);
remote_error_number
=
0
;
remote_error_buf
[
0
]
=
'\0'
;
...
...
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