diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-04 06:44:29 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-04 06:44:29 +0200 |
| commit | 5a7189cf8c238c991e2b590ee3bb968d13fed63c (patch) | |
| tree | 9422199b72af37e7e45cf053811938d70083bcfa | |
| parent | adfe2c3ab4f62288458de25175312de3e1b6a29c (diff) | |
| download | mariadb-git-5a7189cf8c238c991e2b590ee3bb968d13fed63c.tar.gz | |
After merge fix
include/violite.h:
Indentation cleanup
| -rw-r--r-- | include/violite.h | 7 | ||||
| -rw-r--r-- | 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; /* |