database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge zim.(none):/home/brian/mysql/mysql-5.0

Browse Source 
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
This commit is contained in:
brian@zim.(none)
2005-08-30 14:40:02 -07:00
parent b423cbf2ce 2b0c81c984
commit 57403ddc9d
143 changed files with 6348 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/handler.h
View File

@ -1129,6 +1129,16 @@ public:
{ return (my_errno=HA_ERR_WRONG_COMMAND); }
virtual ulonglong get_auto_increment();
virtual void restore_auto_increment();
/*
Reset the auto-increment counter to the given value, i.e. the next row
inserted will get the given value. This is called e.g. after TRUNCATE
is emulated by doing a 'DELETE FROM t'. HA_ERR_WRONG_COMMAND is
returned by storage engines that don't support this operation.
*/
virtual int reset_auto_increment(ulonglong value)
{ return HA_ERR_WRONG_COMMAND; }
virtual void update_create_info(HA_CREATE_INFO *create_info) {}
/* admin commands - called from mysql_admin_table */
@ -1339,6 +1349,8 @@ extern ulong total_ha, total_ha_2pc;
#define ha_supports_generate(T) (T != DB_TYPE_INNODB && \
T != DB_TYPE_BERKELEY_DB && \
T != DB_TYPE_ARCHIVE_DB && \
T != DB_TYPE_FEDERATED_DB && \
T != DB_TYPE_NDBCLUSTER)
/* lookups */