database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-12 12:25:37 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new


sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/sp.result:
  manual merge
mysql-test/t/sp.test:
  manual merge
storage/csv/ha_tina.cc:
  manual merge
storage/myisam/ha_myisam.cc:
  manual merge
This commit is contained in:
unknown
2006-09-28 04:44:55 +04:00
parent 5529b7fb95 ac4b662363
commit 2d48a1f2a3
26 changed files with 235 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/handler.h
View File

@@ -690,6 +690,7 @@ struct handlerton
#define HTON_FLUSH_AFTER_RENAME (1 << 4)
#define HTON_NOT_USER_SELECTABLE (1 << 5)
#define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not supported
#define HTON_SUPPORT_LOG_TABLES (1 << 7) //Engine supports log tables
typedef struct st_thd_trans
{