diff options
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | innobase/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/sql_delete.cc | 3 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8a92048f9ab..499887b8065 100644 --- a/acinclude.m4 +++ b/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\ diff --git a/innobase/Makefile.am b/innobase/Makefile.am index cc4ce312d8d..17d7130f3e0 100644 --- a/innobase/Makefile.am +++ b/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 diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index ed6607c61dd..c8b85d57c0e 100644 --- a/sql/sql_delete.cc +++ b/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++; } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 27217f24cde..5add9199ad4 100644 --- a/sql/sql_yacc.yy +++ b/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 {} |