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
10719727
Commit
10719727
authored
May 29, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents
e7375bd4
971dc90e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
68 additions
and
7 deletions
+68
-7
mysql-test/t/information_schema.test
mysql-test/t/information_schema.test
+0
-3
mysql-test/t/information_schema_chmod.test
mysql-test/t/information_schema_chmod.test
+3
-0
mysql-test/t/wait_timeout.test
mysql-test/t/wait_timeout.test
+64
-4
sql/sp_head.cc
sql/sp_head.cc
+1
-0
No files found.
mysql-test/t/information_schema.test
View file @
10719727
...
@@ -5,9 +5,6 @@
...
@@ -5,9 +5,6 @@
# on the presence of the log tables (which are CSV-based).
# on the presence of the log tables (which are CSV-based).
--
source
include
/
have_csv
.
inc
--
source
include
/
have_csv
.
inc
# This test uses chmod, can't be run with root permissions
--
source
include
/
not_as_root
.
inc
# Test for information_schema.schemata &
# Test for information_schema.schemata &
# show databases
# show databases
...
...
mysql-test/t/information_schema_chmod.test
View file @
10719727
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
#
#
--
source
include
/
not_windows
.
inc
--
source
include
/
not_windows
.
inc
# This test uses chmod, can't be run with root permissions
--
source
include
/
not_as_root
.
inc
#
#
# Bug #15851 Unlistable directories yield no info from information_schema
# Bug #15851 Unlistable directories yield no info from information_schema
...
...
mysql-test/t/wait_timeout.test
View file @
10719727
...
@@ -4,10 +4,41 @@
...
@@ -4,10 +4,41 @@
#
#
# Bug #8731: wait_timeout does not work on Mac OS X
# Bug #8731: wait_timeout does not work on Mac OS X
#
#
# Connect with another connection and reset counters
--
disable_query_log
connect
(
wait_con
,
localhost
,
root
,,
test
,,);
flush
status
;
# Reset counters
connection
wait_con
;
let
$retries
=
300
;
let
$aborted_clients
=
`SHOW STATUS LIKE 'aborted_clients'`
;
set
@
aborted_clients
=
0
;
--
enable_query_log
# Disable reconnect and do the query
connection
default
;
--
disable_reconnect
--
disable_reconnect
select
1
;
select
1
;
# wait_timeout is 1, so we should get disconnected now
--
sleep
2
# Switch to wait_con and wait until server has aborted the connection
--
disable_query_log
connection
wait_con
;
while
(
!
`select @aborted_clients`
)
{
sleep
0.1
;
let
$aborted_clients
=
`SHOW STATUS LIKE 'aborted_clients'`
;
eval
set
@
aborted_clients
=
SUBSTRING
(
'$aborted_clients'
,
16
)
+
0
;
dec
$retries
;
if
(
!
$retries
)
{
Failed
to
detect
that
client
has
been
aborted
;
}
}
--
enable_query_log
connection
default
;
# When the connection is closed in this way, the error code should
# When the connection is closed in this way, the error code should
# be consistent see bug#2845 for an explanation
# be consistent see bug#2845 for an explanation
--
error
2006
--
error
2006
...
@@ -15,12 +46,41 @@ select 2;
...
@@ -15,12 +46,41 @@ select 2;
--
enable_reconnect
--
enable_reconnect
select
3
;
select
3
;
#
# Do the same test as above on a TCP connection
# Do the same test as above on a TCP connection
# (which we get by specifying a ip adress)
# Connect with another connection and reset counters
--
disable_query_log
connection
wait_con
;
flush
status
;
# Reset counters
let
$retries
=
300
;
let
$aborted_clients
=
`SHOW STATUS LIKE 'aborted_clients'`
;
set
@
aborted_clients
=
0
;
--
enable_query_log
connect
(
con1
,
127.0
.
0.1
,
root
,,
test
,
$MASTER_MYPORT
,);
connect
(
con1
,
127.0
.
0.1
,
root
,,
test
,
$MASTER_MYPORT
,);
--
disable_reconnect
--
disable_reconnect
select
1
;
select
1
;
# wait_timeout is 1, so we should get disconnected now
--
sleep
2
# Switch to wait_con and wait until server has aborted the connection
--
disable_query_log
connection
wait_con
;
while
(
!
`select @aborted_clients`
)
{
sleep
0.1
;
let
$aborted_clients
=
`SHOW STATUS LIKE 'aborted_clients'`
;
eval
set
@
aborted_clients
=
SUBSTRING
(
'$aborted_clients'
,
16
)
+
0
;
dec
$retries
;
if
(
!
$retries
)
{
Failed
to
detect
that
client
has
been
aborted
;
}
}
--
enable_query_log
connection
con1
;
# When the connection is closed in this way, the error code should
# When the connection is closed in this way, the error code should
# be consistent see bug#2845 for an explanation
# be consistent see bug#2845 for an explanation
--
error
2006
--
error
2006
...
...
sql/sp_head.cc
View file @
10719727
...
@@ -250,6 +250,7 @@ sp_get_flags_for_command(LEX *lex)
...
@@ -250,6 +250,7 @@ sp_get_flags_for_command(LEX *lex)
case
SQLCOM_TRUNCATE
:
case
SQLCOM_TRUNCATE
:
case
SQLCOM_COMMIT
:
case
SQLCOM_COMMIT
:
case
SQLCOM_ROLLBACK
:
case
SQLCOM_ROLLBACK
:
case
SQLCOM_LOAD
:
case
SQLCOM_LOAD_MASTER_DATA
:
case
SQLCOM_LOAD_MASTER_DATA
:
case
SQLCOM_LOCK_TABLES
:
case
SQLCOM_LOCK_TABLES
:
case
SQLCOM_CREATE_PROCEDURE
:
case
SQLCOM_CREATE_PROCEDURE
:
...
...
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