diff options
author | unknown <monty@narttu.mysql.fi> | 2003-03-19 22:25:44 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-03-19 22:25:44 +0200 |
commit | 161942e3cefd8923633e0a7b3b7a9860a95f6fbc (patch) | |
tree | abbee7d78d1399086c301a5bd02f3ba4a9e1ea38 /sql/handler.h | |
parent | d7bedeb998c911c921d7b67dc07049955481d9b7 (diff) | |
parent | 7517a59a6dac4580b1f7b5cf87abf6d75b096bbc (diff) | |
download | mariadb-git-161942e3cefd8923633e0a7b3b7a9860a95f6fbc.tar.gz |
Merge with 4.0.12
Docs/internals.texi:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_vio.c:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/key.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
strings/strto.c:
Auto merged
Diffstat (limited to 'sql/handler.h')
-rw-r--r-- | sql/handler.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 824f02b5a3d..c6a4578a26c 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -67,7 +67,6 @@ #define HA_CAN_FULLTEXT (HA_NO_PREFIX_CHAR_KEYS*2) #define HA_CAN_SQL_HANDLER (HA_CAN_FULLTEXT*2) #define HA_NO_AUTO_INCREMENT (HA_CAN_SQL_HANDLER*2) -#define HA_NOT_MULTI_UPDATE (HA_NO_AUTO_INCREMENT*2) /* Next record gives next record according last record read (even |