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
887e6af6
Commit
887e6af6
authored
18 years ago
by
holyfoot/hf@mysql.com/deer.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt
into mysql.com:/home/hf/work/current_stmt/my50-current_stmt
parents
4eff5ab2
d0ef58b6
Branches unavailable
Tags unavailable
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
include/mysql.h
include/mysql.h
+0
-6
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+1
-1
sql/sql_class.h
sql/sql_class.h
+6
-0
No files found.
include/mysql.h
View file @
887e6af6
...
...
@@ -293,12 +293,6 @@ typedef struct st_mysql
/* needed for embedded server - no net buffer to store the 'info' */
char
*
info_buffer
;
#endif
/*
In embedded server it points to the statement that is processed
in the current query. We store some results directly in statement
fields then.
*/
struct
st_mysql_stmt
*
current_stmt
;
}
MYSQL
;
typedef
struct
st_mysql_res
{
...
...
This diff is collapsed.
Click to expand it.
libmysqld/lib_sql.cc
View file @
887e6af6
...
...
@@ -100,7 +100,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
mysql
->
affected_rows
=
~
(
my_ulonglong
)
0
;
mysql
->
field_count
=
0
;
net
->
last_errno
=
0
;
mysql
->
current_stmt
=
stmt
;
thd
->
current_stmt
=
stmt
;
thd
->
store_globals
();
// Fix if more than one connect
/*
...
...
This diff is collapsed.
Click to expand it.
sql/sql_class.h
View file @
887e6af6
...
...
@@ -1097,6 +1097,12 @@ class THD :public Statement,
struct
st_mysql_data
**
data_tail
;
void
clear_data_list
();
struct
st_mysql_data
*
alloc_new_dataset
();
/*
In embedded server it points to the statement that is processed
in the current query. We store some results directly in statement
fields then.
*/
struct
st_mysql_stmt
*
current_stmt
;
#endif
NET
net
;
// client connection descriptor
MEM_ROOT
warn_root
;
// For warnings and errors
...
...
This diff is collapsed.
Click to expand it.
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