After merge fixes

af84ae00 · unknown · f9412871 · af84ae00
Commit af84ae00 authored Oct 22, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +2 -2

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1575,7 +1575,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
      mysql_log.write(thd,command,packet);
      if (mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
                          0, 0) < 0)
-        send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);
+        send_error(thd, thd->killed ? ER_SERVER_SHUTDOWN : 0);
      break;
    }
  case COM_DROP_DB:				// QQ: To be removed
@@ -1598,7 +1598,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
      mysql_log.write(thd,command,db);
      if (mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),
                      0, 0) < 0)
-        send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);
+        send_error(thd, thd->killed ? ER_SERVER_SHUTDOWN : 0);
      break;
    }
 #ifndef EMBEDDED_LIBRARY