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
7b3f0677
Commit
7b3f0677
authored
16 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-bugteam
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
parents
cd81c92f
74282b57
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
mysql-test/r/status.result
mysql-test/r/status.result
+3
-2
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-1
mysql-test/t/status.test
mysql-test/t/status.test
+3
-3
No files found.
mysql-test/r/status.result
View file @
7b3f0677
...
@@ -162,7 +162,8 @@ Variable_name Value
...
@@ -162,7 +162,8 @@ Variable_name Value
Com_show_status 8
Com_show_status 8
rnd_diff tmp_table_diff
rnd_diff tmp_table_diff
20 8
20 8
show global status like 'Com%function%';
flush status;
show status like 'Com%function%';
Variable_name Value
Variable_name Value
Com_alter_function 0
Com_alter_function 0
Com_create_function 0
Com_create_function 0
...
@@ -176,7 +177,7 @@ set ret = x * 10;
...
@@ -176,7 +177,7 @@ set ret = x * 10;
return ret;
return ret;
end //
end //
drop function f1;
drop function f1;
show
global
status like 'Com%function%';
show status like 'Com%function%';
Variable_name Value
Variable_name Value
Com_alter_function 0
Com_alter_function 0
Com_create_function 1
Com_create_function 1
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/disabled.def
View file @
7b3f0677
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
#
#
##############################################################################
##############################################################################
federated_transactions : Bug#29523 Transactions do not work
federated_transactions : Bug#29523 Transactions do not work
status : Bug#32966 main.status fails
ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
user_limits : Bug#23921 random failure of user_limits.test
user_limits : Bug#23921 random failure of user_limits.test
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/status.test
View file @
7b3f0677
...
@@ -245,7 +245,8 @@ eval select substring_index('$rnd_next2',0x9,-1)-substring_index('$rnd_next',0x9
...
@@ -245,7 +245,8 @@ eval select substring_index('$rnd_next2',0x9,-1)-substring_index('$rnd_next',0x9
#
#
# Bug#30252 Com_create_function is not incremented.
# Bug#30252 Com_create_function is not incremented.
#
#
show
global
status
like
'Com%function%'
;
flush
status
;
show
status
like
'Com%function%'
;
DELIMITER
//;
DELIMITER
//;
create
function
f1
(
x
INTEGER
)
returns
integer
create
function
f1
(
x
INTEGER
)
returns
integer
...
@@ -257,8 +258,7 @@ create function f1 (x INTEGER) returns integer
...
@@ -257,8 +258,7 @@ create function f1 (x INTEGER) returns integer
DELIMITER
;
//
DELIMITER
;
//
drop
function
f1
;
drop
function
f1
;
show
status
like
'Com%function%'
;
show
global
status
like
'Com%function%'
;
# End of 5.1 tests
# End of 5.1 tests
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