diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
| commit | 3a35c30027ed27bf6d2f457168fab2e4ef9e198e (patch) | |
| tree | 7cc1a3e7f00427d01d2117c9b3c41231a827afd3 /sql/sql_insert.cc | |
| parent | 717284b85cfdaeacb0e28177e13cf6fd24f36a3b (diff) | |
| download | mariadb-git-3a35c30027ed27bf6d2f457168fab2e4ef9e198e.tar.gz | |
Fixed compiler warnings (Mostly VC++):
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs
Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index dcb4152f64f..191fc60dfd5 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2042,7 +2042,9 @@ err: */ ha_rollback_stmt(thd); +#ifndef __WIN__ end: +#endif /* di should be unlinked from the thread handler list and have no active clients @@ -2698,7 +2700,7 @@ void select_insert::send_error(uint errcode,const char *err) bool select_insert::send_eof() { - int error,error2; + int error; bool const trans_table= table->file->has_transactions(); ulonglong id; DBUG_ENTER("select_insert::send_eof"); @@ -2750,9 +2752,9 @@ bool select_insert::send_eof() */ if (trans_table || thd->current_stmt_binlog_row_based) { - int const error2= ha_autocommit_or_rollback(thd, error); + int error2= ha_autocommit_or_rollback(thd, error); if (error2 && !error) - error=error2; + error= error2; } table->file->ha_release_auto_increment(); |