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
e56d603a
Commit
e56d603a
authored
Nov 26, 2003
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
parents
6413b0e9
fa9047e2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
include/mysql_version.h.in
include/mysql_version.h.in
+1
-0
sql/mysqld.cc
sql/mysqld.cc
+2
-2
sql/set_var.cc
sql/set_var.cc
+1
-0
No files found.
include/mysql_version.h.in
View file @
e56d603a
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
#define MYSQL_PORT @MYSQL_TCP_PORT@
#define MYSQL_PORT @MYSQL_TCP_PORT@
#define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@"
#define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@"
#define MYSQL_CONFIG_NAME "my"
#define MYSQL_CONFIG_NAME "my"
#define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@"
/* mysqld compile time options */
/* mysqld compile time options */
#ifndef MYSQL_CHARSET
#ifndef MYSQL_CHARSET
...
...
sql/mysqld.cc
View file @
e56d603a
...
@@ -4278,8 +4278,8 @@ struct show_var_st status_vars[]= {
...
@@ -4278,8 +4278,8 @@ struct show_var_st status_vars[]= {
static
void
print_version
(
void
)
static
void
print_version
(
void
)
{
{
printf
(
"%s Ver %s for %s on %s
\n
"
,
my_progname
,
printf
(
"%s Ver %s for %s on %s
(%s)
\n
"
,
my_progname
,
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
);
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
,
MYSQL_COMPILATION_COMMENT
);
}
}
static
void
use_help
(
void
)
static
void
use_help
(
void
)
...
...
sql/set_var.cc
View file @
e56d603a
...
@@ -593,6 +593,7 @@ struct show_var_st init_vars[]= {
...
@@ -593,6 +593,7 @@ struct show_var_st init_vars[]= {
SHOW_SYS
},
SHOW_SYS
},
{
sys_trans_prealloc_size
.
name
,
(
char
*
)
&
sys_trans_prealloc_size
,
SHOW_SYS
},
{
sys_trans_prealloc_size
.
name
,
(
char
*
)
&
sys_trans_prealloc_size
,
SHOW_SYS
},
{
"version"
,
server_version
,
SHOW_CHAR
},
{
"version"
,
server_version
,
SHOW_CHAR
},
{
"version_comment"
,
(
char
*
)
MYSQL_COMPILATION_COMMENT
,
SHOW_CHAR
},
{
sys_net_wait_timeout
.
name
,
(
char
*
)
&
sys_net_wait_timeout
,
SHOW_SYS
},
{
sys_net_wait_timeout
.
name
,
(
char
*
)
&
sys_net_wait_timeout
,
SHOW_SYS
},
{
NullS
,
NullS
,
SHOW_LONG
}
{
NullS
,
NullS
,
SHOW_LONG
}
};
};
...
...
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