summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorunknown <acurtis@pcgem.rdg.cyberkinetica.com>2005-01-30 10:24:03 +0000
committerunknown <acurtis@pcgem.rdg.cyberkinetica.com>2005-01-30 10:24:03 +0000
commit934fde094cc092baa110dc3821e098d3d286e0c6 (patch)
treebda1004d18f8e154dab73080aead4599e04c4706 /sql/mysql_priv.h
parent360d32f20120c8aebdb26dd5450cae8fbfaf81cf (diff)
downloadmariadb-git-934fde094cc092baa110dc3821e098d3d286e0c6.tar.gz
Bug#7011
Fix replication for multi-update new test - rpl_multi_update2 sql/mysql_priv.h: Bug#7011 New function mysql_multi_update_lock() sql/sql_parse.cc: Bug#7011 New function check_multi_update_lock() For multi-update on slave, perform an early open&lock sql/sql_update.cc: Bug#7011 Split out multi-update locking into its own function, mysql_multi_update_lock()
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index b123927d09e..cbbf3b843d3 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -469,6 +469,9 @@ int mysql_update(THD *thd,TABLE_LIST *tables,List<Item> &fields,
List<Item> &values,COND *conds,
ORDER *order, ha_rows limit,
enum enum_duplicates handle_duplicates);
+int mysql_multi_update_lock(THD *thd,
+ TABLE_LIST *table_list,
+ List<Item> *fields);
int mysql_multi_update(THD *thd, TABLE_LIST *table_list,
List<Item> *fields, List<Item> *values,
COND *conds, ulong options,