diff options
| author | unknown <holyfoot@mysql.com> | 2006-05-14 20:56:22 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-05-14 20:56:22 +0500 |
| commit | c59039b476c9a30c2cdae15c0572fc5eabac5871 (patch) | |
| tree | 2a20070fedaba6419c38102c3dbc750d276651a0 /sql/handler.h | |
| parent | 44de69cfdd696552bd396195b2e9e6cc9335993e (diff) | |
| parent | bfc6b0fa88b169e435299be261180970d22d9fbf (diff) | |
| download | mariadb-git-c59039b476c9a30c2cdae15c0572fc5eabac5871.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.14573
sql/handler.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index afee6bb9f8d..9a5a3b04823 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -865,6 +865,7 @@ public: virtual int ha_initialise(); int ha_open(TABLE *table, const char *name, int mode, int test_if_locked); bool update_auto_increment(); + void print_keydupp_error(uint key_nr, const char *msg); virtual void print_error(int error, myf errflag); virtual bool get_error_message(int error, String *buf); uint get_dup_key(int error); |