diff options
| author | unknown <tim@work.mysql.com> | 2000-11-19 22:27:46 +0100 |
|---|---|---|
| committer | unknown <tim@work.mysql.com> | 2000-11-19 22:27:46 +0100 |
| commit | 22a61956da64790f713dd2089c099a7452dc0472 (patch) | |
| tree | 63979f3b3140516eb9b57d7b1738194c88c4cdc9 | |
| parent | c9b16b81048d04260dc8e3ba43f218aa9ef5f06f (diff) | |
| parent | 0ca890bd19b5e71bf5540d852793479c32506571 (diff) | |
| download | mariadb-git-22a61956da64790f713dd2089c099a7452dc0472.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/src/mysql
BitKeeper/etc/logging_ok:
auto-union
sql/ha_berkeley.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
| -rw-r--r-- | BitKeeper/etc/logging_ok | 6 | ||||
| -rw-r--r-- | client/thread_test.c | 9 | ||||
| -rw-r--r-- | sql/ha_berkeley.cc | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 5946f313d0c..437d68d72f8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,8 +1,14 @@ jani@prima.mysql.com +jcole@tetra.bedford.progress.com +jcole@tetra.spaceapes.com monty@donna.mysql.com monty@narttu.mysql.fi +mwagner@evoq.home.mwagner.org mwagner@work.mysql.com +sasha@laptop.slkc.uswest.net sasha@mysql.sashanet.com +sasha@work.mysql.com serg@serg.mysql.com tim@threads.polyesthetic.msg +tim@work.mysql.com yfaktoro@nslinuxw2.bedford.progress.com diff --git a/client/thread_test.c b/client/thread_test.c index def3381eb89..c76489ed946 100644 --- a/client/thread_test.c +++ b/client/thread_test.c @@ -16,10 +16,6 @@ MA 02111-1307, USA */ #include <global.h> -#include <my_sys.h> -#include <my_pthread.h> -#include "mysql.h" -#include <getopt.h> #ifndef THREAD @@ -30,6 +26,11 @@ int main(int argc, char **argv) } #else +#include <my_sys.h> +#include <my_pthread.h> +#include "mysql.h" +#include <getopt.h> + static my_bool version,verbose; static uint thread_count,number_of_tests=1000,number_of_threads=2; static pthread_cond_t COND_thread_count; diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index df54bef5d52..db5bff0c7b0 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1375,8 +1375,9 @@ int ha_berkeley::external_lock(THD *thd, int lock_type) && !(thd->options & OPTION_BEGIN)) { /* - F_UNLOCK is done without a transaction commit / rollback. This - means that something went wrong. + F_UNLOCK is done without a transaction commit / rollback. + This happens if the thread didn't update any rows or if + something went wrong during an update. We can in this case silenty abort the transaction. */ DBUG_PRINT("trans",("aborting transaction")); |