Commit eded6783 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
extra/comp_err.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
BUILD/SETUP.sh:
  Use local
parents 10ddaa78 cc379fff

client/mysql.cc

+0 −4
Original line number Diff line number Diff line
@@ -442,10 +442,6 @@ int main(int argc,char *argv[]) 
    signal(SIGINT, handle_sigint);              // Catch SIGINT to clean up

  signal(SIGQUIT, mysql_end);			// Catch SIGQUIT to clean up



  /*

    Run in interactive mode like the ingres/postgres monitor

  */



  put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",

	   INFO_INFO);

  sprintf((char*) glob_buffer.ptr(),