diff options
author | unknown <monty@mashka.mysql.fi> | 2002-09-18 21:04:49 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-09-18 21:04:49 +0300 |
commit | 83fc12f21653f1e6fc12c61791f4e6f2dd87be96 (patch) | |
tree | 83f34b98c4e43e4f23f9b941d93676b65ef1b657 /vio | |
parent | aef675029f198c61a1a1c46dbb68890f705d40db (diff) | |
download | mariadb-git-83fc12f21653f1e6fc12c61791f4e6f2dd87be96.tar.gz |
Added code to flush a bulk_insert index.
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment.
Docs/manual.texi:
Changelog
include/my_base.h:
Added code to flush a bulk_insert index
myisam/mi_extra.c:
Added code to flush a bulk_insert index
mysql-test/r/insert.result:
test of auto_increment and bulk_insert
mysql-test/t/insert.test:
test of auto_increment and bulk_insert
sql/ha_myisam.cc:
Added code to flush a bulk_insert index
sql/sql_insert.cc:
Mark that bulk_insert is used
sql/sql_load.cc:
Mark that bulk_insert is used
Remove duplicated call to initialize bulk insert
sql/table.h:
Mark that bulk_insert is used
vio/viosslfactories.c:
Remove compiler warning
Diffstat (limited to 'vio')
-rw-r--r-- | vio/viosslfactories.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 23a35f540f6..9e7a1475951 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -71,9 +71,11 @@ report_errors() while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) { +#ifndef DBUG_OFF /* Avoid warning */ char buf[200]; DBUG_PRINT("error", ("OpenSSL: %s:%s:%d:%s\n", ERR_error_string(l,buf), file,line,(flags & ERR_TXT_STRING) ? data : "")) ; +#endif } DBUG_VOID_RETURN; } |