From 5a7189cf8c238c991e2b590ee3bb968d13fed63c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Feb 2003 06:44:29 +0200 Subject: After merge fix include/violite.h: Indentation cleanup --- include/violite.h | 7 +++++-- sql/sql_parse.cc | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/violite.h b/include/violite.h index fa8a3bf0d59..4963fbb21e4 100644 --- a/include/violite.h +++ b/include/violite.h @@ -31,8 +31,11 @@ extern "C" { #endif /* __cplusplus */ -enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, - VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL, VIO_TYPE_SHARED_MEMORY }; +enum enum_vio_type +{ + VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, VIO_TYPE_NAMEDPIPE, + VIO_TYPE_SSL, VIO_TYPE_SHARED_MEMORY +}; #ifndef __WIN__ #define HANDLE void * diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ae0cda01c1a..a9085e253b3 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1210,7 +1210,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, DBUG_PRINT("query",("%-.4096s",thd->query)); mysql_parse(thd,thd->query, thd->query_length); - while (!thd->killed && !thd->fatal_error && thd->lex.found_colon) + while (!thd->killed && !thd->is_fatal_error && thd->lex.found_colon) { char *packet= thd->lex.found_colon; /* -- cgit v1.2.1