diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-18 00:03:37 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-18 00:03:37 +0200 |
| commit | f8509fecdb9a6453230e1418907a0923f002201d (patch) | |
| tree | e430180603a3dd86bed056e15a90ce368911ca5a /sql/sql_update.cc | |
| parent | 456102115c2f70982e600e40e34a10afde72c703 (diff) | |
| download | mariadb-git-f8509fecdb9a6453230e1418907a0923f002201d.tar.gz | |
Added locks needed for Innobase
Fixed mutex problem when doing automatic repair of MyISAM tables
Docs/manual.texi:
changelog
include/thr_lock.h:
Added TL_READ_WITH_SHARED_LOCKS for Innobase
mysql-test/r/update.result:
Added 'select' to verify update results
mysql-test/t/update.test:
Better code coverage
mysys/getvar.c:
Allow space in to --set-variable
mysys/thr_lock.c:
Added TL_READ_WITH_SHARED_LOCKS
sql/ha_myisam.cc:
Added comment
sql/lock.cc:
Added missing broadcast
sql/sql_base.cc:
Fixed some mutex problem when doing automatic repair of MyISAM tables
sql/sql_update.cc:
Purecoverage
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 9a08fec5a3d..a4e5dea5e76 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -62,7 +62,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields, LINT_INIT(timestamp_query_id); if (!(table = open_ltable(thd,table_list,lock_type))) - DBUG_RETURN(-1); + DBUG_RETURN(-1); /* purecov: inspected */ save_time_stamp=table->time_stamp; table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); thd->proc_info="init"; @@ -156,8 +156,8 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields, if (open_cached_file(&tempfile, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE, MYF(MY_WME))) { - delete select; - table->time_stamp=save_time_stamp; // Restore timestamp pointer + delete select; /* purecov: inspected */ + table->time_stamp=save_time_stamp; // Restore timestamp pointer /* purecov: inspected */ DBUG_RETURN(-1); } if (old_used_keys & ((key_map) 1 << used_index)) @@ -176,8 +176,8 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields, if (my_b_write(&tempfile,table->file->ref, table->file->ref_length)) { - error=1; - break; + error=1; /* purecov: inspected */ + break; /* purecov: inspected */ } } else @@ -209,7 +209,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields, select->head=table; } if (reinit_io_cache(&tempfile,READ_CACHE,0L,0,0)) - error=1; + error=1; /* purecov: inspected */ select->file=tempfile; // Read row ptrs from this file if (error >= 0) { @@ -237,7 +237,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields, { store_record(table,1); if (fill_record(fields,values)) - break; + break; /* purecov: inspected */ found++; if (compare_record(table, query_id)) { |