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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
4fe6ab1f
Commit
4fe6ab1f
authored
Aug 18, 2004
by
tomas@poseidon.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
parents
e0731bad
5a9533bb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
extra/perror.c
extra/perror.c
+2
-2
sql/Makefile.am
sql/Makefile.am
+1
-0
No files found.
extra/perror.c
View file @
4fe6ab1f
...
@@ -42,7 +42,7 @@ static struct my_option my_long_options[] =
...
@@ -42,7 +42,7 @@ static struct my_option my_long_options[] =
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#ifdef HAVE_NDBCLUSTER_DB
#ifdef HAVE_NDBCLUSTER_DB
{
"ndb"
,
0
,
"Ndbcluster storage engine specific error codes."
,
(
gptr
*
)
&
ndb_code
,
{
"ndb"
,
0
,
"Ndbcluster storage engine specific error codes."
,
(
gptr
*
)
&
ndb_code
,
(
gptr
*
)
&
ndb_code
,
0
,
GET_BOOL
,
NO_ARG
,
1
,
0
,
0
,
0
,
0
,
0
},
(
gptr
*
)
&
ndb_code
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
#endif
#ifdef HAVE_SYS_ERRLIST
#ifdef HAVE_SYS_ERRLIST
{
"all"
,
'a'
,
"Print all the error messages and the number."
,
{
"all"
,
'a'
,
"Print all the error messages and the number."
,
...
@@ -222,7 +222,7 @@ int main(int argc,char *argv[])
...
@@ -222,7 +222,7 @@ int main(int argc,char *argv[])
#ifdef HAVE_NDBCLUSTER_DB
#ifdef HAVE_NDBCLUSTER_DB
if
(
ndb_code
)
if
(
ndb_code
)
{
{
if
(
ndb_error_string
(
code
,
ndb_string
,
1024
)
<
0
)
if
(
ndb_error_string
(
code
,
ndb_string
,
sizeof
(
ndb_string
)
)
<
0
)
msg
=
0
;
msg
=
0
;
else
else
msg
=
ndb_string
;
msg
=
ndb_string
;
...
...
sql/Makefile.am
View file @
4fe6ab1f
...
@@ -45,6 +45,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
...
@@ -45,6 +45,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
@innodb_system_libs@
\
@innodb_system_libs@
\
@ndbcluster_libs@ @ndbcluster_system_libs@
\
@ndbcluster_libs@ @ndbcluster_system_libs@
\
$(LDADD)
$(CXXLDFLAGS)
$(WRAPLIBS)
@LIBDL@ @openssl_libs@
$(LDADD)
$(CXXLDFLAGS)
$(WRAPLIBS)
@LIBDL@ @openssl_libs@
mysqld_DEPENDENCIES
=
@ndbcluster_libs@ @ndbcluster_system_libs@
noinst_HEADERS
=
item.h item_func.h item_sum.h item_cmpfunc.h
\
noinst_HEADERS
=
item.h item_func.h item_sum.h item_cmpfunc.h
\
item_strfunc.h item_timefunc.h item_uniq.h
\
item_strfunc.h item_timefunc.h item_uniq.h
\
item_create.h item_subselect.h item_row.h
\
item_create.h item_subselect.h item_row.h
\
...
...
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