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
4eb3d765
Commit
4eb3d765
authored
Jan 07, 2010
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Plain Diff
upmerge 49269 amendment
parents
84953134
9ab9c73a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
23 deletions
+6
-23
client/mysqltest.cc
client/mysqltest.cc
+3
-4
mysql-test/r/mysqltest.result
mysql-test/r/mysqltest.result
+0
-7
mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
+1
-0
mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
...-test/suite/sys_vars/t/sql_low_priority_updates_func.test
+1
-0
mysql-test/t/mysqltest.test
mysql-test/t/mysqltest.test
+0
-12
mysql-test/t/partition_innodb_semi_consistent.test
mysql-test/t/partition_innodb_semi_consistent.test
+1
-0
No files found.
client/mysqltest.cc
View file @
4eb3d765
...
@@ -4584,7 +4584,6 @@ void select_connection_name(const char *name)
...
@@ -4584,7 +4584,6 @@ void select_connection_name(const char *name)
if
(
!
con
)
if
(
!
con
)
die
(
"connection '%s' not found in connection pool"
,
name
);
die
(
"connection '%s' not found in connection pool"
,
name
);
con
->
pending
=
FALSE
;
set_current_connection
(
con
);
set_current_connection
(
con
);
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
...
@@ -6489,9 +6488,6 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
...
@@ -6489,9 +6488,6 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
if
(
flags
&
QUERY_SEND_FLAG
)
if
(
flags
&
QUERY_SEND_FLAG
)
{
{
if
(
cn
->
pending
)
die
(
"Cannot run query on connection between send and reap"
);
/*
/*
Send the query
Send the query
*/
*/
...
@@ -7076,6 +7072,9 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
...
@@ -7076,6 +7072,9 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
init_dynamic_string
(
&
ds_warnings
,
NULL
,
0
,
256
);
init_dynamic_string
(
&
ds_warnings
,
NULL
,
0
,
256
);
if
(
cn
->
pending
&&
(
flags
&
QUERY_SEND_FLAG
))
die
(
"Cannot run query on connection between send and reap"
);
/*
/*
Evaluate query if this is an eval command
Evaluate query if this is an eval command
*/
*/
...
...
mysql-test/r/mysqltest.result
View file @
4eb3d765
...
@@ -542,13 +542,6 @@ f1
...
@@ -542,13 +542,6 @@ f1
Abcd
Abcd
mysqltest: At line 2: Cannot run query on connection between send and reap
mysqltest: At line 2: Cannot run query on connection between send and reap
select * from t1;;
select * from t1;;
select * from t1;;
select 1;
1
1
select 2;
2
2
drop table t1;
drop table t1;
mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'
mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'
mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'
mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'
...
...
mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
View file @
4eb3d765
...
@@ -78,6 +78,7 @@ COMMIT;
...
@@ -78,6 +78,7 @@ COMMIT;
--
echo
'CONNECTION con2'
--
echo
'CONNECTION con2'
CONNECTION
con2
;
CONNECTION
con2
;
reap
;
UNLOCK
tables
;
UNLOCK
tables
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
...
...
mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
View file @
4eb3d765
...
@@ -127,6 +127,7 @@ connection con0;
...
@@ -127,6 +127,7 @@ connection con0;
SET
SESSION
low_priority_updates
=
OFF
;
SET
SESSION
low_priority_updates
=
OFF
;
--
echo
**
Connection
con1
**
--
echo
**
Connection
con1
**
connection
con1
;
connection
con1
;
reap
;
SET
SESSION
low_priority_updates
=
OFF
;
SET
SESSION
low_priority_updates
=
OFF
;
--
echo
**
Connection
default
**
--
echo
**
Connection
default
**
connection
default
;
connection
default
;
...
...
mysql-test/t/mysqltest.test
View file @
4eb3d765
...
@@ -1654,18 +1654,6 @@ EOF
...
@@ -1654,18 +1654,6 @@ EOF
--
exec
$MYSQL_TEST
<
$MYSQLTEST_VARDIR
/
tmp
/
mysqltest
.
in
2
>&
1
--
exec
$MYSQL_TEST
<
$MYSQLTEST_VARDIR
/
tmp
/
mysqltest
.
in
2
>&
1
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqltest
.
in
;
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqltest
.
in
;
# 7. Test that stmt after send without reap IS allowed
# if we have switched connections
connect
(
test_con1
,
localhost
,
root
,,);
--
send
select
*
from
t1
;
connection
default
;
select
1
;
connection
test_con1
;
select
2
;
disconnect
test_con1
;
connection
default
;
drop
table
t1
;
drop
table
t1
;
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
...
...
mysql-test/t/partition_innodb_semi_consistent.test
View file @
4eb3d765
...
@@ -187,6 +187,7 @@ SELECT * FROM t1;
...
@@ -187,6 +187,7 @@ SELECT * FROM t1;
--
echo
# Switch to connection con2
--
echo
# Switch to connection con2
connection
con2
;
connection
con2
;
reap
;
SELECT
*
FROM
t1
;
SELECT
*
FROM
t1
;
connection
default
;
connection
default
;
...
...
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