database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Cleanups

Browse Source 
Don't use DBUG library for struct st_my_thread_var to make code less complicated.


Docs/manual.texi:
  Cleanup
acinclude.m4:
  Search after openssl in /usr/local
client/mysql.cc:
  Fix prompt
client/mysqladmin.c:
  Cleanup
client/mysqltest.c:
  Cleanup
include/my_pthread.h:
  Move thread variables to the right location
include/my_sys.h:
  Move thread variables to the right location
include/mysql.h:
  Clean up client prototypes
libmysql/libmysql.c:
  Clean up client prototypes
mysys/my_static.h:
  Cleanup
mysys/my_thr_init.c:
  Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
  Small optimization
sql/net_pkg.cc:
  Cleanup
sql/sql_parse.cc:
  Allow VARCHAR(0)
This commit is contained in:
unknown
2002-04-02 17:54:57 +03:00
parent 546b6a679f
commit c95270b8c4
14 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/mysql.cc
View File

@ -2340,7 +2340,7 @@ static int
com_status(String *buffer __attribute__((unused)),
char *line __attribute__((unused)))
{
char *status;
const char *status;
tee_puts("--------------", stdout);
usage(1); /* Print version */
if (connected)
@ -2635,18 +2635,21 @@ static const char* construct_prompt() {
processed_prompt.append(current_db ? current_db : "(none)");
break;
case 'h':
if (strstr(mysql_get_host_info(&mysql),"Localhost")) {
{
const char *prompt=mysql_get_host_info(&mysql);
if (strstr(prompt, "Localhost"))
processed_prompt.append("localhost");
}
else {
processed_prompt.append(strtok(mysql_get_host_info(&mysql)," "));
else
{
const char *end=strcend(prompt,' ');
processed_prompt.append(prompt, (uint) (end-prompt));
}
break;
}
case 'p':
if (strstr(mysql_get_host_info(&mysql),"TCP/IP")
|| ! mysql.unix_socket) {
if (strstr(mysql_get_host_info(&mysql),"TCP/IP") ||
! mysql.unix_socket)
add_int_to_prompt(mysql.port);
}
else
processed_prompt.append(strrchr(mysql.unix_socket,'/')+1);
break;