summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-05-13 10:54:07 +0300
committerunknown <monty@mashka.mysql.fi>2003-05-13 10:54:07 +0300
commit10c790eff016ff0fc779baeb7ebf94940d3544e7 (patch)
tree911f869319dc53526bc2bb909aa87944db9d2696 /mysys
parent504fd4d43990e507b685eb336ee672c637ecf4cb (diff)
downloadmariadb-git-10c790eff016ff0fc779baeb7ebf94940d3544e7.tar.gz
Safety fix to enable RAID in max binaries
Better fix for format('nan') Fix for HAVING COUNT(DISTINCT...) myisam/mi_check.c: Better error message myisam/mi_dynrec.c: Simple code cleanup myisam/myisamchk.c: Better error messages mysql-test/r/func_misc.result: Added back test for format('nan') mysql-test/r/having.result: New test mysql-test/t/func_misc.test: Added back test for format('nan') mysql-test/t/having.test: Added test for count(distinct) in having mysys/raid.cc: Safety fix to enable RAID in max binaries scripts/mysql_install_db.sh: Create data directories even if --in-rpm is used (for MaxOSX) sql/item_strfunc.cc: Better fix for format('nan') sql/mysqld.cc: Give stacktrace on assert() sql/sql_yacc.yy: Fix for HAVING COUNT(DISTINCT...) tests/big_record.pl: Extend test to abuse packed MyISAM tables tests/table_types.pl: Fixed wrong merge
Diffstat (limited to 'mysys')
-rw-r--r--mysys/raid.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/raid.cc b/mysys/raid.cc
index d6359dc0f93..0b688464fb3 100644
--- a/mysys/raid.cc
+++ b/mysys/raid.cc
@@ -157,10 +157,10 @@ extern "C" {
DBUG_PRINT("enter",("Fd: %d pos: %lu whence: %d MyFlags: %d",
fd, (ulong) pos, whence, MyFlags));
- assert(pos != MY_FILEPOS_ERROR);
-
if (is_raid(fd))
{
+ assert(pos != MY_FILEPOS_ERROR);
+
RaidFd *raid= (*dynamic_element(&RaidFd::_raid_map,fd,RaidFd**));
DBUG_RETURN(raid->Seek(pos,whence,MyFlags));
}