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

Merge with 4.1

Browse Source
This commit is contained in:
monty@mishka.local
2004-12-22 13:54:39 +02:00
parent 198dc7a8ec 98f2a83539
commit 4f4bbfc279
395 changed files with 11807 additions and 25533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_cache.cc
View File

@@ -300,7 +300,6 @@ TODO list:
#include <m_ctype.h>
#include <my_dir.h>
#include <hash.h>
#include "sql_acl.h"
#include "ha_myisammrg.h"
#ifndef MASTER
#include "../srclib/myisammrg/myrg_def.h"
@@ -375,7 +374,7 @@ inline Query_cache_block * Query_cache_block_table::block()
return (Query_cache_block *)(((byte*)this) -
ALIGN_SIZE(sizeof(Query_cache_block_table)*n) -
ALIGN_SIZE(sizeof(Query_cache_block)));
};
}
/*****************************************************************************
Query_cache_block method(s)