diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 19:38:40 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 19:38:40 +0200 |
| commit | e5706080f08eea5a5e67f85778307fd2cc021861 (patch) | |
| tree | 3be2ddec9867a7253e617d92f8fa85f72d57e6d3 /sql/sql_insert.cc | |
| parent | 1384e640053aee1f528148e876a632b2a0a2a8ed (diff) | |
| download | mariadb-git-e5706080f08eea5a5e67f85778307fd2cc021861.tar.gz | |
After merge fixes
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
extra/yassl/src/ssl.cpp:
Removed compiler warning
extra/yassl/taocrypt/src/asn.cpp:
After merge fixes
extra/yassl/testsuite/testsuite.cpp:
Removed compiler warning
mysql-test/r/ndb_lock.result:
After merge fixes
ndb/src/common/debugger/EventLogger.cpp:
Removed compiler warning
ndb/src/common/util/ConfigValues.cpp:
Removed compiler warning
ndb/src/common/util/NdbSqlUtil.cpp:
Removed compiler warning
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Removed compiler warning
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
Removed compiler warning
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
Removed compiler warning
ndb/src/kernel/vm/ndbd_malloc.cpp:
Removed compiler warning
ndb/src/mgmclient/main.cpp:
Removed compiler warning
ndb/src/ndbapi/SignalSender.cpp:
Removed compiler warning
sql/ha_ndbcluster.cc:
Some extra safety
sql/item_cmpfunc.cc:
After merge fixes
sql/item_subselect.cc:
After merge fixes
sql/sql_insert.cc:
After merge fixes
(This actually fixes a bug in old code when many connections are in use)
support-files/compiler_warnings.supp:
Removed some suppressed warnings
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 3b479841c1d..aa429f9250e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1193,7 +1193,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) goto err; } if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) || - compare_record(table, query_id)) + compare_record(table, thd->query_id)) { info->updated++; |