This commit is contained in:
monty@mashka.mysql.fi 2004-02-22 08:54:06 +02:00
parent 349358a95b
commit e74182fe52
4 changed files with 2 additions and 5 deletions

View File

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

View File

@ -23,7 +23,7 @@ TAR = gtar
noinst_HEADERS = ib_config.h noinst_HEADERS = ib_config.h
SUBDIRS = os ut btr buf com data dict dyn eval fil fsp fut \ 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 pars que read rem row srv sync thr trx usr
# Don't update the files from bitkeeper # Don't update the files from bitkeeper

View File

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

View File

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