mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 17:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into  poseidon.ndb.mysql.com:/home/tomas/v7


include/my_base.h:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
This commit is contained in:
unknown 2006-01-13 03:17:09 +01:00
commit a37604ea9a
119 changed files with 8259 additions and 614 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/my_base.h
View file

@ -154,7 +154,14 @@ enum ha_extra_function {
to overwrite entire row.
*/
HA_EXTRA_KEYREAD_PRESERVE_FIELDS,
HA_EXTRA_MMAP
HA_EXTRA_MMAP,
/*
Ignore if the a tuple is not found, continue processing the
transaction and ignore that 'row'. Needed for idempotency
handling on the slave
*/
HA_EXTRA_IGNORE_NO_KEY,
HA_EXTRA_NO_IGNORE_NO_KEY
};
/* The following is parameter to ha_panic() */