diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
| commit | 456102115c2f70982e600e40e34a10afde72c703 (patch) | |
| tree | a90993e8e601e10bc825a635e85bda9a1d5ee5bd /sql/sql_update.cc | |
| parent | d83e79ce76d77cfdf2b5589e053df988b90f17d7 (diff) | |
| download | mariadb-git-456102115c2f70982e600e40e34a10afde72c703.tar.gz | |
Write UNION() for MERGE tables
Docs/manual.texi:
Clearify when logging is done
myisam/myisamchk.c:
Better error message
mysql-test/r/merge.result:
Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
Search by default in database directory
sql/ha_myisammrg.h:
Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
removed compiler warning
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index d17b5768440..9a08fec5a3d 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -59,6 +59,7 @@ int mysql_update(THD *thd,TABLE_LIST *table_list,List<Item> &fields, READ_RECORD info; DBUG_ENTER("mysql_update"); LINT_INIT(used_index); + LINT_INIT(timestamp_query_id); if (!(table = open_ltable(thd,table_list,lock_type))) DBUG_RETURN(-1); |