Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt

into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Manual merge/
This commit is contained in:
unknown 2007-10-09 14:32:43 +04:00
commit 2e53f36311
2 changed files with 4 additions and 4 deletions

View file

@ -965,7 +965,6 @@ void init_update_queries(void);
void free_max_user_conn(void);
pthread_handler_t handle_bootstrap(void *arg);
bool mysql_execute_command(THD *thd);
bool do_command(THD *thd);
bool dispatch_command(enum enum_server_command command, THD *thd,
char* packet, uint packet_length);
void log_slow_statement(THD *thd);