Cleanups

acinclude.m4:
  Remove innobase/libodbc
innobase/Makefile.am:
  Remove innobase/libodbc
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fixed wrong merge

acinclude.m4

@@ -1208,7 +1208,6 @@ dnl Some libs are listed several times, in order for gcc to sort out
 dnl circular references.
       innodb_libs="\
  \$(top_builddir)/innobase/usr/libusr.a\
- \$(top_builddir)/innobase/odbc/libodbc.a\
  \$(top_builddir)/innobase/srv/libsrv.a\
  \$(top_builddir)/innobase/dict/libdict.a\
  \$(top_builddir)/innobase/que/libque.a\

innobase/Makefile.am

@@ -23,7 +23,7 @@ TAR =			gtar
 noinst_HEADERS = ib_config.h
 
 SUBDIRS =		os ut btr buf com data dict dyn eval fil fsp fut \
-			ha ibuf include lock log mach mem mtr odbc page \
+			ha ibuf include lock log mach mem mtr page \
 			pars que read rem row srv sync thr trx usr
 
 # Don't update the files from bitkeeper

sql/sql_delete.cc

@@ -454,8 +454,7 @@ int multi_delete::do_deletes(bool from_send_error)
 	{
 	  DBUG_RETURN(local_error);
 	}
-	else
-	  break;
+	break;
       }
       deleted++;
     }

sql/sql_yacc.yy

@@ -3364,7 +3364,6 @@ keyword:
 	| MASTER_PASSWORD_SYM	{}
 	| MASTER_SERVER_ID_SYM  {}
 	| MASTER_CONNECT_RETRY_SYM	{}
-	| MASTER_SERVER_ID_SYM  {}
 	| MAX_CONNECTIONS_PER_HOUR       {}
 	| MAX_QUERIES_PER_HOUR  {}
 	| MAX_UPDATES_PER_HOUR  {}