diff options
| author | unknown <hf@deer.(none)> | 2003-10-01 16:44:57 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-10-01 16:44:57 +0500 |
| commit | e50b19a04756a7aa6965d7797a21a04efd534b14 (patch) | |
| tree | 801af6a8599b4055c8948a7f7c06275ba1d543f2 /sql/ha_berkeley.cc | |
| parent | 6fbd3da597615c94b2aab7b02fd9e1b8f9092c1b (diff) | |
| download | mariadb-git-e50b19a04756a7aa6965d7797a21a04efd534b14.tar.gz | |
Fix for #1430
there was an error about sendind prepared parameters to the server
libmysqld/lib_sql.cc:
parameter's length added as a parameter
sql/ha_berkeley.cc:
these lines sometimes crashes in embedded library
so i #ifdef-ed it
sql/item.h:
add the data_len parameter in the embedded case
sql/sql_prepare.cc:
i added macroses to make headers of store_param_xxx functions
they have different number of parameters in standalone an embedded servers
also get_param_length now is implemented differently in embedded server
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 34915a6020c..1b99efeaa43 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -304,11 +304,13 @@ void berkeley_cleanup_log_files(void) char **names; int error; +// by HF. Sometimes it crashes. TODO - find out why +#ifndef EMBEDDED_LIBRARY /* XXX: Probably this should be done somewhere else, and * should be tunable by the user. */ if ((error = db_env->txn_checkpoint(db_env, 0, 0, 0))) my_error(ER_ERROR_DURING_CHECKPOINT, MYF(0), error); /* purecov: inspected */ - +#endif if ((error = db_env->log_archive(db_env, &names, DB_ARCH_ABS)) != 0) { DBUG_PRINT("error", ("log_archive failed (error %d)", error)); /* purecov: inspected */ |