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
5a1672dd
Commit
5a1672dd
authored
Mar 06, 2006
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compilation fixes
parent
d190e08e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
29 deletions
+23
-29
.bzrignore
.bzrignore
+1
-0
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+22
-29
No files found.
.bzrignore
View file @
5a1672dd
...
...
@@ -1274,3 +1274,4 @@ vio/viotest.cpp
zlib/*.ds?
zlib/*.vcproj
scripts/mysql_upgrade
include/openssl
libmysqld/lib_sql.cc
View file @
5a1672dd
...
...
@@ -38,6 +38,7 @@ int check_user(THD *thd, enum enum_server_command command,
const
char
*
passwd
,
uint
passwd_len
,
const
char
*
db
,
bool
check_count
);
C_MODE_START
#include <mysql.h>
#undef ER
#include "errmsg.h"
...
...
@@ -46,19 +47,6 @@ C_MODE_START
static
my_bool
emb_read_query_result
(
MYSQL
*
mysql
);
void
THD
::
clear_data_list
()
{
while
(
first_data
)
{
MYSQL_DATA
*
data
=
first_data
;
first_data
=
data
->
embedded_info
->
next
;
free_rows
(
data
);
}
data_tail
=
&
first_data
;
free_rows
(
cur_data
);
cur_data
=
0
;
}
/*
Reads error information from the MYSQL_DATA and puts
...
...
@@ -423,15 +411,6 @@ MYSQL_METHODS embedded_methods=
emb_read_rows_from_cursor
};
C_MODE_END
void
THD
::
clear_error
()
{
net
.
last_error
[
0
]
=
0
;
net
.
last_errno
=
0
;
net
.
report_error
=
0
;
}
/*
Make a copy of array and the strings array points to
*/
...
...
@@ -458,10 +437,6 @@ char **copy_arguments(int argc, char **argv)
return
res
;
}
extern
"C"
{
char
**
copy_arguments_ptr
=
0
;
int
init_embedded_server
(
int
argc
,
char
**
argv
,
char
**
groups
)
...
...
@@ -571,9 +546,7 @@ void end_embedded_server()
clean_up
(
0
);
}
}
/* extern "C" */
C_MODE_START
void
init_embedded_mysql
(
MYSQL
*
mysql
,
int
client_flag
,
char
*
db
)
{
THD
*
thd
=
(
THD
*
)
mysql
->
thd
;
...
...
@@ -693,6 +666,26 @@ int check_embedded_connection(MYSQL *mysql)
C_MODE_END
void
THD
::
clear_data_list
()
{
while
(
first_data
)
{
MYSQL_DATA
*
data
=
first_data
;
first_data
=
data
->
embedded_info
->
next
;
free_rows
(
data
);
}
data_tail
=
&
first_data
;
free_rows
(
cur_data
);
cur_data
=
0
;
}
void
THD
::
clear_error
()
{
net
.
last_error
[
0
]
=
0
;
net
.
last_errno
=
0
;
net
.
report_error
=
0
;
}
static
char
*
dup_str_aux
(
MEM_ROOT
*
root
,
const
char
*
from
,
uint
length
,
CHARSET_INFO
*
fromcs
,
CHARSET_INFO
*
tocs
)
{
...
...
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