diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-29 22:05:53 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-29 22:05:53 +0200 |
| commit | b0792a9af34a3f266e6eb2822ed2bf0671839664 (patch) | |
| tree | b28c969dcd0fed98efdee9cd0040842339cb35a4 /sql | |
| parent | c610353837031c30086493c0df6dab4a11af1b30 (diff) | |
| parent | 056656f7be9de251ec1ae7135254235a8929af21 (diff) | |
| download | mariadb-git-b0792a9af34a3f266e6eb2822ed2bf0671839664.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_handler.cc | 4 | ||||
| -rw-r--r-- | sql/sql_update.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index c7fb237ccf2..46cbe5e44d3 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -63,7 +63,11 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables) TABLE **ptr=find_table_ptr_by_name(thd, tables->db, tables->name); if (*ptr) + { + VOID(pthread_mutex_lock(&LOCK_open)); close_thread_table(thd, ptr); + VOID(pthread_mutex_unlock(&LOCK_open)); + } send_ok(&thd->net); return 0; diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 3111268849f..0422d9664b6 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -199,7 +199,7 @@ int mysql_update(THD *thd, } init_read_record(&info,thd,table,select,0,1); - thd->proc_info="searching"; + thd->proc_info="Searching rows for update"; while (!(error=info.read_record(&info)) && !thd->killed) { @@ -261,7 +261,7 @@ int mysql_update(THD *thd, ha_rows updated=0L,found=0L; thd->count_cuted_fields=1; /* calc cuted fields */ thd->cuted_fields=0L; - thd->proc_info="updating"; + thd->proc_info="Updating"; query_id=thd->query_id; while (!(error=info.read_record(&info)) && !thd->killed) |