database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.0-engines

Browse Source 
into  rama.(none):/home/jimw/my/mysql-5.0-17608


include/my_base.h:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
This commit is contained in:
unknown
2006-07-18 10:25:04 -07:00
parent abbf7ad014 e52940aa7f
commit a00f18e5e6
5 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_base.h
View File

@@ -356,8 +356,9 @@ enum ha_base_keytype {
#define HA_ERR_NULL_IN_SPATIAL 158 /* NULLs are not supported in spatial index */
#define HA_ERR_TABLE_DEF_CHANGED 159 /* The table changed in storage engine */
#define HA_ERR_TABLE_NEEDS_UPGRADE 160 /* The table changed in storage engine */
#define HA_ERR_TABLE_READONLY 161 /* The table is not writable */
#define HA_ERR_LAST 160 /*Copy last error nr.*/
#define HA_ERR_LAST 161 /*Copy last error nr.*/
/* Add error numbers before HA_ERR_LAST and change it accordingly. */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)