Commit 5847d107 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 

into bob.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
parents 0b076d2c f6f90e7d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ ram@mysql.r18.ru 
ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

root@home.(none)

root@mc04.(none)

root@x3.internalnet

client/mysql.cc

+9 −1
Original line number Diff line number Diff line
@@ -3232,13 +3232,20 @@ static const char* construct_prompt() 
	break;

      }

      case 'p':

      {

#ifndef EMBEDDED_LIBRARY

	if (!connected)

	{

	  processed_prompt.append("not_connected");

	  break;

	}

	if (strstr(mysql_get_host_info(&mysql),"TCP/IP") ||



	const char *host_info = mysql_get_host_info(&mysql);

	if (strstr(host_info, "memory")) 

	{

		processed_prompt.append( mysql.host );

	}

	else if (strstr(host_info,"TCP/IP") ||

	    !mysql.unix_socket)

	  add_int_to_prompt(mysql.port);

	else
@@ -3247,6 +3254,7 @@ static const char* construct_prompt() 
 	  processed_prompt.append(pos ? pos+1 : mysql.unix_socket);

	}

#endif

      }

	break;

      case 'U':

	if (!full_username)

sql/sql_lex.cc

+1 −0
Original line number Diff line number Diff line
@@ -912,6 +912,7 @@ int yylex(void *arg, void *yythd) 
        if ((thd->client_capabilities & CLIENT_MULTI_STATEMENTS) && 

            (thd->command != COM_PREPARE))

        {

	  lex->safe_to_cache_query=0;

          lex->found_colon=(char*)lex->ptr;

          thd->server_status |= SERVER_MORE_RESULTS_EXISTS;

          lex->next_state=MY_LEX_END;