summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2004-03-15 21:36:16 +0400
committerunknown <vva@eagle.mysql.r18.ru>2004-03-15 21:36:16 +0400
commit1d3b16335a824df832bb94c447248cef925bdfaf (patch)
tree0cf15fc15f8655c51809614f856f64a00c8abb5a /sql/sql_class.h
parent1b81fcf8ca993a4aac88492f1332868b0fea9233 (diff)
downloadmariadb-git-1d3b16335a824df832bb94c447248cef925bdfaf.tar.gz
actions for bug
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical 1. added COPY_INFO::updated to work with it in 'insert .. on duplicate' instead of COPY_INFO::deleted 2. added affected rows to output of "info:" in mysqltest.c client/mysqltest.c: added "affected rows" to output of "info : ".. mysql-test/r/insert_update.result: added tests for affected rows with insert .. duplicate (bug #2709) mysql-test/t/insert_update.test: added tests for affected rows with insert .. duplicate (bug #2709) sql/sql_class.h: added COPY_INFO::updated sql/sql_insert.cc: get write_record to work with COPY_INFO::updated instead of COPY_INFO::deleted for 'insert ... duplicate' statement
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 567135b1378..5432a08a86f 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -194,6 +194,7 @@ public:
typedef struct st_copy_info {
ha_rows records;
ha_rows deleted;
+ ha_rows updated;
ha_rows copied;
ha_rows error_count;
enum enum_duplicates handle_duplicates;