diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-05-11 04:20:07 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-05-11 04:20:07 +0300 |
| commit | 56261e0ecacfad7d50eab2d64a20357a0d851e65 (patch) | |
| tree | 1b585fa51440255a8db1b9eb43e5fb6a9fe99b70 /include | |
| parent | c8e0b5e89c388fdd308cf13e607abf463406482f (diff) | |
| parent | fad18fe995e1801bdb243b50141278726c931abf (diff) | |
| download | mariadb-git-56261e0ecacfad7d50eab2d64a20357a0d851e65.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/mysqldump.test:
Manual merge.
sql/sql_show.cc:
Manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index e014f7c33b7..0390106880a 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -340,7 +340,7 @@ enum ha_base_keytype { #define HA_ERR_WRONG_COMMAND 131 /* Command not supported */ #define HA_ERR_OLD_FILE 132 /* old databasfile */ #define HA_ERR_NO_ACTIVE_RECORD 133 /* No record read in update() */ -#define HA_ERR_RECORD_DELETED 134 /* Intern error-code */ +#define HA_ERR_RECORD_DELETED 134 /* A record is not there */ #define HA_ERR_RECORD_FILE_FULL 135 /* No more room in file */ #define HA_ERR_INDEX_FILE_FULL 136 /* No more room in file */ #define HA_ERR_END_OF_FILE 137 /* end in next/prev/first/last */ |