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 gbichot3.local:/home/mysql_src/mysql-5.1-clean

Browse Source 
into  gbichot3.local:/home/mysql_src/mysql-maria


BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Makefile.am:
  Auto merged
configure.in:
  Auto merged
config/ac-macros/plugins.m4:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
unittest/Makefile.am:
  Auto merged
BitKeeper/triggers/post-commit:
  merge
include/my_base.h:
  merge
libmysqld/Makefile.am:
  merge
mysql-test/mysql-test-run.pl:
  merge
mysys/Makefile.am:
  merge
sql/Makefile.am:
  merge
sql/handler.h:
  merge
sql/item_func.h:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  merge
sql/set_var.cc:
  merge
sql/set_var.h:
  merge
sql/sql_class.h:
  merge
storage/csv/ha_tina.cc:
  merge
storage/myisam/Makefile.am:
  merge
storage/myisam/ha_myisam.cc:
  merge
storage/myisam/ha_myisam.h:
  merge
storage/myisam/mi_check.c:
  merge
storage/myisam/mi_delete.c:
  merge
storage/myisam/mi_dynrec.c:
  merge
storage/myisam/mi_packrec.c:
  merge
storage/myisam/mi_unique.c:
  merge
storage/myisam/mi_write.c:
  merge
storage/myisam/myisamdef.h:
  merge
This commit is contained in:
unknown
2006-10-10 16:59:50 +02:00
parent ef0ee7642a 8e04cdb2dd
commit abdc4682cd
159 changed files with 51757 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.h
View File

@ -21,6 +21,7 @@
#pragma interface /* gcc class implementation */
#endif
#include <my_handler.h>
#include <ft_global.h>
#include <keycache.h>
@ -260,6 +261,7 @@ enum legacy_db_type
DB_TYPE_TABLE_FUNCTION,
DB_TYPE_MEMCACHE,
DB_TYPE_FALCON,
DB_TYPE_MARIA,
DB_TYPE_FIRST_DYNAMIC=42,
DB_TYPE_DEFAULT=127 // Must be last
};