Merge work.mysql.com:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

1 files changed, 0 insertions, 1 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index f90c731ad6b..7e3864fad01 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -21,7 +21,6 @@
 #pragma interface			/* gcc class implementation */
 #endif
 
-
 class Query_log_event;
 class Load_log_event;