After merge fix

include/violite.h:
  Indentation cleanup

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 *

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;
       /*