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
4a3553ed
Commit
4a3553ed
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
parents
04bad39e
0992a2a7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
6 deletions
+1
-6
sql/sql_class.h
sql/sql_class.h
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+0
-5
No files found.
sql/sql_class.h
View file @
4a3553ed
...
...
@@ -564,7 +564,7 @@ public:
List
<
TABLE
>
temporary_tables_should_be_free
;
// list of temporary tables
List
<
MYSQL_ERROR
>
warn_list
;
uint
warn_count
[(
uint
)
MYSQL_ERROR
::
WARN_LEVEL_END
];
uint
total_warn_count
,
old_total_warn_count
;
uint
total_warn_count
;
ulong
query_id
,
warn_id
,
version
,
options
,
thread_id
,
col_access
;
ulong
current_stmt_id
;
ulong
rand_saved_seed1
,
rand_saved_seed2
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
4a3553ed
...
...
@@ -1704,11 +1704,6 @@ mysql_execute_command(THD *thd)
*/
if
(
tables
||
&
lex
->
select_lex
!=
lex
->
all_selects_list
)
mysql_reset_errors
(
thd
);
/*
Save old warning count to be able to send to client how many warnings we
got
*/
thd
->
old_total_warn_count
=
thd
->
total_warn_count
;
#ifdef HAVE_REPLICATION
if
(
thd
->
slave_thread
)
...
...
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