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
ad754b05
Commit
ad754b05
authored
Sep 08, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into selena.:H:/MYSQL/src/#12517-mysql-4.1
parents
f5df855f
34422f78
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
2 deletions
+26
-2
mysql-test/r/connect.result
mysql-test/r/connect.result
+6
-0
mysql-test/t/connect.test
mysql-test/t/connect.test
+18
-0
sql/sql_class.cc
sql/sql_class.cc
+2
-2
No files found.
mysql-test/r/connect.result
View file @
ad754b05
drop table if exists t1,t2;
show tables;
Tables_in_mysql
columns_priv
...
...
@@ -65,3 +66,8 @@ show tables;
Tables_in_test
delete from mysql.user where user=_binary"test";
flush privileges;
create table t1 (id integer not null auto_increment primary key);
create temporary table t2(id integer not null auto_increment primary key);
set @id := 1;
delete from t1 where id like @id;
drop table t1;
mysql-test/t/connect.test
View file @
ad754b05
...
...
@@ -6,6 +6,10 @@
# This test makes no sense with the embedded server
--
source
include
/
not_embedded
.
inc
--
disable_warnings
drop
table
if
exists
t1
,
t2
;
--
enable_warnings
#connect (con1,localhost,root,,"");
#show tables;
connect
(
con1
,
localhost
,
root
,,
mysql
);
...
...
@@ -77,4 +81,18 @@ show tables;
delete
from
mysql
.
user
where
user
=
_binary
"test"
;
flush
privileges
;
#
# Bug#12517: Clear user variables and replication events before
# closing temp tables in thread cleanup.
connect
(
con2
,
localhost
,
root
,,
test
);
connection
con2
;
create
table
t1
(
id
integer
not
null
auto_increment
primary
key
);
create
temporary
table
t2
(
id
integer
not
null
auto_increment
primary
key
);
set
@
id
:=
1
;
delete
from
t1
where
id
like
@
id
;
disconnect
con2
;
--
sleep
5
connection
default
;
drop
table
t1
;
# End of 4.1 tests
sql/sql_class.cc
View file @
ad754b05
...
...
@@ -353,12 +353,12 @@ void THD::cleanup(void)
mysql_ha_flush
(
this
,
(
TABLE_LIST
*
)
0
,
MYSQL_HA_CLOSE_FINAL
|
MYSQL_HA_FLUSH_ALL
);
hash_free
(
&
handler_tables_hash
);
delete_dynamic
(
&
user_var_events
);
hash_free
(
&
user_vars
);
close_temporary_tables
(
this
);
my_free
((
char
*
)
variables
.
time_format
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
((
char
*
)
variables
.
date_format
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
((
char
*
)
variables
.
datetime_format
,
MYF
(
MY_ALLOW_ZERO_PTR
));
delete_dynamic
(
&
user_var_events
);
hash_free
(
&
user_vars
);
if
(
global_read_lock
)
unlock_global_read_lock
(
this
);
if
(
ull
)
...
...
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