summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorunknown <serg@mysql.com>2005-09-30 20:30:09 +0200
committerunknown <serg@mysql.com>2005-09-30 20:30:09 +0200
commitf69c1867c95db7598d0815b07b555ecaf3cf1e87 (patch)
tree778c75e28c050f727b123eaca67c82f625911683 /sql/handler.h
parent246bd8cad9015f2a0e876f3d52704f33f206f021 (diff)
parent8f842e8fc9f304e4f95d81df3c222bab11ced391 (diff)
downloadmariadb-git-f69c1867c95db7598d0815b07b555ecaf3cf1e87.tar.gz
Merge
sql/ha_ndbcluster.cc: SCCS merged sql/handler.h: SCCS merged
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 50f697bc980..9a9e0bb4f69 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -654,7 +654,7 @@ public:
virtual int reset() { return extra(HA_EXTRA_RESET); }
virtual int external_lock(THD *thd, int lock_type) { return 0; }
virtual void unlock_row() {}
- virtual int start_stmt(THD *thd) {return 0;}
+ virtual int start_stmt(THD *thd, thr_lock_type lock_type) {return 0;}
/*
This is called to delete all rows in a table
If the handler don't support this, then this function will