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
b0efa176
Commit
b0efa176
authored
May 15, 2009
by
Joerg Bruehe
Browse files
Options
Browse Files
Download
Plain Diff
Merge main 5.0 -> 5.0-build
parents
88294e30
dbf8997b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
14 deletions
+24
-14
include/config-win.h
include/config-win.h
+1
-0
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+0
-5
mysql-test/r/information_schema_community.result
mysql-test/r/information_schema_community.result
+8
-0
mysql-test/t/information_schema.test
mysql-test/t/information_schema.test
+0
-7
mysql-test/t/information_schema_community.test
mysql-test/t/information_schema_community.test
+13
-0
sql/set_var.cc
sql/set_var.cc
+2
-2
No files found.
include/config-win.h
View file @
b0efa176
...
...
@@ -208,6 +208,7 @@ typedef uint rf_SetTimer;
/* If query profiling should be enabled by default */
#define ENABLED_PROFILING 1
#define COMMUNITY_SERVER 1
/* Convert some simple functions to Posix */
...
...
mysql-test/r/information_schema.result
View file @
b0efa176
...
...
@@ -1318,11 +1318,6 @@ TABLE_PRIVILEGES information_schema.TABLE_PRIVILEGES 1
TRIGGERS information_schema.TRIGGERS 1
USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
VIEWS information_schema.VIEWS 1
show global status like "Uptime_%";
Variable_name Value
flush status;
show global status like "Uptime_%";
Variable_name Value
create table t1(f1 int);
create view v1 as select f1+1 as a from t1;
create table t2 (f1 int, f2 int);
...
...
mysql-test/r/information_schema_community.result
0 → 100644
View file @
b0efa176
show global status like "Uptime_%";
Variable_name Value
Uptime_since_flush_status #
flush status;
show global status like "Uptime_%";
Variable_name Value
Uptime_since_flush_status #
End of 5.0 tests.
mysql-test/t/information_schema.test
View file @
b0efa176
...
...
@@ -1028,13 +1028,6 @@ where t.table_schema = 'information_schema' and
(
c2
.
column_type
=
'varchar(7)'
or
c2
.
column_type
=
'varchar(20)'
)
group
by
c2
.
column_type
order
by
num
limit
1
)
group
by
t
.
table_name
order
by
num1
,
t
.
table_name
;
# Bug#24822: Patch: uptime_since_flush_status
#
--
replace_column
2
#
show
global
status
like
"Uptime_%"
;
flush
status
;
--
replace_column
2
#
show
global
status
like
"Uptime_%"
;
# Almost certainly zero
#
...
...
mysql-test/t/information_schema_community.test
0 → 100644
View file @
b0efa176
--
source
include
/
have_community_features
.
inc
#
# Bug#24822: Patch: uptime_since_flush_status
#
--
replace_column
2
#
show
global
status
like
"Uptime_%"
;
flush
status
;
--
replace_column
2
#
show
global
status
like
"Uptime_%"
;
# Almost certainly zero
--
echo
End
of
5.0
tests
.
sql/set_var.cc
View file @
b0efa176
...
...
@@ -736,7 +736,7 @@ sys_var *sys_variables[]=
&
sys_optimizer_prune_level
,
&
sys_optimizer_search_depth
,
&
sys_preload_buff_size
,
#if
def ENABLED_PROFILING
#if
defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
&
sys_profiling
,
&
sys_profiling_history_size
,
#endif
...
...
@@ -1060,7 +1060,7 @@ struct show_var_st init_vars[]= {
{
sys_plugin_dir
.
name
,
(
char
*
)
&
sys_plugin_dir
,
SHOW_SYS
},
{
"port"
,
(
char
*
)
&
mysqld_port
,
SHOW_INT
},
{
sys_preload_buff_size
.
name
,
(
char
*
)
&
sys_preload_buff_size
,
SHOW_SYS
},
#if
def ENABLED_PROFILING
#if
defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
{
sys_profiling
.
name
,
(
char
*
)
&
sys_profiling
,
SHOW_SYS
},
{
sys_profiling_history_size
.
name
,
(
char
*
)
&
sys_profiling_history_size
,
SHOW_SYS
},
#endif
...
...
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