diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-02-21 02:45:02 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-02-21 02:45:02 +0200 |
| commit | df843c4ce26e2c5d152098302b209252c712382e (patch) | |
| tree | 01e5c523135209a8a44a7a99d51a1dc1b33a367e /storage/maria/ma_scan.c | |
| parent | 8bb95a820ad92cd39e9ade0b70989bee7fe6d040 (diff) | |
| download | mariadb-git-df843c4ce26e2c5d152098302b209252c712382e.tar.gz | |
Fixed problems with ma_test2 and mi_test2 on high-byte-first system
Fixed bug in ma_test2 when last row in table is deleted
Fixed that ma_test_recovery.pl works on Solaris (by using digest instead of md5sum)
Fixed some compiler warnings generated by the Forte compiler
dbug/dbug.c:
Added cast to get rid of compiler warning
mysys/lf_alloc-pin.c:
Added cast to get rid of compiler warning
mysys/my_bitmap.c:
Removed impossible DBUG_ASSERT()'s to get rid of compiler warnings
mysys/my_compress.c:
Removed wrong cast to get rid of compiler warning
storage/maria/lockman.c:
Added cast to get rid of compiler warning
storage/maria/ma_open.c:
Added fix from MyISAM to allocate space in key buffer for nod pointer
storage/maria/ma_recovery.c:
Fixed initialization that caused compiler warning
storage/maria/ma_rsame.c:
More DBUG_PRINT
storage/maria/ma_scan.c:
Better comment
storage/maria/ma_statrec.c:
More DBUG_PRINT and comments
Fixed indentation
BitKeeper/etc/ignore:
added storage/maria/unittest/tmp/*
storage/maria/ma_test2.c:
Fixed bug that caused maria_rsame() to fail if test removed last row
Fixed wrong usage of longget(); Should be uint4korr()
storage/maria/unittest/ma_test_recovery.pl:
Use md5sum or digest to calculate md5.
This allows this script to be run on Linux and Solaris
storage/myisam/mi_test2.c:
Fixed wrong usage of longget(); Should be uint4korr()
strings/ctype.c:
Added casts to get rid of compiler warnings
sql-bench/myisam.cnf:
New BitKeeper file ``sql-bench/myisam.cnf''
Diffstat (limited to 'storage/maria/ma_scan.c')
| -rw-r--r-- | storage/maria/ma_scan.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/maria/ma_scan.c b/storage/maria/ma_scan.c index 48e9e3400ce..cbac463a2c8 100644 --- a/storage/maria/ma_scan.c +++ b/storage/maria/ma_scan.c @@ -40,9 +40,10 @@ int maria_scan_init(register MARIA_HA *info) record Read data here RETURN - 0 ok - HA_ERR_END_OF_FILE End of file - # Error code + 0 ok + HA_ERR_END_OF_FILE End of file + HA_ERR_RECORD_DELETED Record was deleted (can only happen for static rec) + # Error code */ int maria_scan(MARIA_HA *info, uchar *record) |