diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-14 02:39:07 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-14 02:39:07 +0300 |
| commit | d5964ba20ca4c00a443c185186def44bb90831b3 (patch) | |
| tree | 47d3199e561726437875c3247556ac5797525366 /extra/perror.c | |
| parent | 9e37676d7cd9ca30a05025b9fcc3424c4e4a1932 (diff) | |
| download | mariadb-git-d5964ba20ca4c00a443c185186def44bb90831b3.tar.gz | |
Fixes for MERGE TABLES and HEAP tables
Docs/manual.texi:
Updated MERGE table stuff + more
extra/perror.c:
Added missing error messages
include/myisammrg.h:
Fixes for MERGE TABLE
include/queues.h:
Fixes for MERGE TABLE
isam/isamlog.c:
Fixed hard bug
myisam/mi_log.c:
cleanup
myisam/mi_open.c:
Fixed file name format in myisam log
myisam/myisamlog.c:
Bug fixes
myisammrg/mymrgdef.h:
Fixes for MERGE TABLE
myisammrg/myrg_create.c:
Fixes for MERGE TABLE
myisammrg/myrg_open.c:
Fixes for MERGE TABLE
myisammrg/myrg_queue.c:
Fixes for MERGE TABLE
myisammrg/myrg_rfirst.c:
Fixes for MERGE TABLE
myisammrg/myrg_rkey.c:
Fixes for MERGE TABLE
myisammrg/myrg_rlast.c:
Fixes for MERGE TABLE
myisammrg/myrg_rnext.c:
Fixes for MERGE TABLE
myisammrg/myrg_rprev.c:
Fixes for MERGE TABLE
myisammrg/myrg_rrnd.c:
Fixes for MERGE TABLE
mysql.proj:
update
mysys/queues.c:
Fixed bug when using reverse queues
sql-bench/test-insert.sh:
Separated some things to get better timings
sql/ha_heap.cc:
Fixed heap table bug
sql/ha_heap.h:
Fixed heap table bug
sql/ha_myisam.h:
Fixed wrong max_keys
sql/ha_myisammrg.cc:
Fixed MERGE TABLES
sql/ha_myisammrg.h:
Fixed MERGE TABLES
sql/handler.h:
Fix for MERGE TABLES and HEAP tables
sql/lex.h:
Fixed MERGE TABLES
sql/mysql_priv.h:
Cleanup of code
sql/sql_acl.cc:
Fixed that privilege tables are flushed at start
sql/sql_lex.h:
Fixed MERGE TABLES
sql/sql_parse.cc:
Fixed MERGE TABLES
sql/sql_select.cc:
Fixes for HEAP tables
sql/sql_table.cc:
Cleanup
sql/sql_yacc.yy:
Fixed MERGE TABLES
Diffstat (limited to 'extra/perror.c')
| -rw-r--r-- | extra/perror.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extra/perror.c b/extra/perror.c index b6d32d50868..6f2fbd864b6 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -17,7 +17,7 @@ /* Return error-text for system error messages and nisam messages */ -#define PERROR_VERSION "2.2" +#define PERROR_VERSION "2.3" #include <global.h> #include <my_sys.h> @@ -59,9 +59,11 @@ static HA_ERRORS ha_errlist[]= { 136,"No more room in index file" }, { 137,"No more records (read after end of file)" }, { 138,"Unsupported extension used for table" }, - { 139,"Too big row (>= 24 M)"}, + { 139,"Too big row (>= 16 M)"}, { 140,"Wrong create options"}, - { 141,"Dupplicate unique on write or update"}, + { 141,"Duplicate unique on write or update"}, + { 142,"Unknown character set used"}, + { 143,"Conflicting table definition between MERGE and mapped table"}, { 0,NullS }, }; |