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
c7d940e1
Commit
c7d940e1
authored
Dec 12, 2003
by
vva@eagle.mysql.r18.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1951/mysql-4.0
parents
1485d9b4
700de3eb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
client/mysql.cc
client/mysql.cc
+4
-4
No files found.
client/mysql.cc
View file @
c7d940e1
...
@@ -358,7 +358,7 @@ int main(int argc,char *argv[])
...
@@ -358,7 +358,7 @@ int main(int argc,char *argv[])
put_info
(
"Welcome to the MySQL monitor. Commands end with ; or
\\
g."
,
put_info
(
"Welcome to the MySQL monitor. Commands end with ; or
\\
g."
,
INFO_INFO
);
INFO_INFO
);
sprintf
((
char
*
)
glob_buffer
.
ptr
(),
sprintf
((
char
*
)
glob_buffer
.
ptr
(),
"Your MySQL connection id is %l
d
to server version: %s
\n
"
,
"Your MySQL connection id is %l
u
to server version: %s
\n
"
,
mysql_thread_id
(
&
mysql
),
mysql_get_server_info
(
&
mysql
));
mysql_thread_id
(
&
mysql
),
mysql_get_server_info
(
&
mysql
));
put_info
((
char
*
)
glob_buffer
.
ptr
(),
INFO_INFO
);
put_info
((
char
*
)
glob_buffer
.
ptr
(),
INFO_INFO
);
...
@@ -1359,7 +1359,7 @@ com_help (String *buffer __attribute__((unused)),
...
@@ -1359,7 +1359,7 @@ com_help (String *buffer __attribute__((unused)),
}
}
if
(
connected
)
if
(
connected
)
tee_fprintf
(
stdout
,
tee_fprintf
(
stdout
,
"
\n
Connection id: %l
d
(Can be used with mysqladmin kill)
\n\n
"
,
"
\n
Connection id: %l
u
(Can be used with mysqladmin kill)
\n\n
"
,
mysql_thread_id
(
&
mysql
));
mysql_thread_id
(
&
mysql
));
else
else
tee_fprintf
(
stdout
,
"Not connected! Reconnect with 'connect'!
\n\n
"
);
tee_fprintf
(
stdout
,
"Not connected! Reconnect with 'connect'!
\n\n
"
);
...
@@ -2109,7 +2109,7 @@ com_connect(String *buffer, char *line)
...
@@ -2109,7 +2109,7 @@ com_connect(String *buffer, char *line)
if
(
connected
)
if
(
connected
)
{
{
sprintf
(
buff
,
"Connection id: %l
d
"
,
mysql_thread_id
(
&
mysql
));
sprintf
(
buff
,
"Connection id: %l
u
"
,
mysql_thread_id
(
&
mysql
));
put_info
(
buff
,
INFO_INFO
);
put_info
(
buff
,
INFO_INFO
);
sprintf
(
buff
,
"Current database: %s
\n
"
,
sprintf
(
buff
,
"Current database: %s
\n
"
,
current_db
?
current_db
:
"*** NONE ***"
);
current_db
?
current_db
:
"*** NONE ***"
);
...
@@ -2323,7 +2323,7 @@ com_status(String *buffer __attribute__((unused)),
...
@@ -2323,7 +2323,7 @@ com_status(String *buffer __attribute__((unused)),
{
{
MYSQL_RES
*
result
;
MYSQL_RES
*
result
;
LINT_INIT
(
result
);
LINT_INIT
(
result
);
tee_fprintf
(
stdout
,
"
\n
Connection id:
\t\t
%l
d
\n
"
,
mysql_thread_id
(
&
mysql
));
tee_fprintf
(
stdout
,
"
\n
Connection id:
\t\t
%l
u
\n
"
,
mysql_thread_id
(
&
mysql
));
if
(
!
mysql_query
(
&
mysql
,
"select DATABASE(),USER()"
)
&&
if
(
!
mysql_query
(
&
mysql
,
"select DATABASE(),USER()"
)
&&
(
result
=
mysql_use_result
(
&
mysql
)))
(
result
=
mysql_use_result
(
&
mysql
)))
{
{
...
...
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