mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
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
This commit is contained in:
@@ -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++;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user