mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
a07e48eca0
Added more DBUG statements Ensure that we are comparing end space with BINARY strings Use 'any_db' instead of '' to mean any database. (For HANDLER command) Only strip ' ' when comparing CHAR, not other space-like characters (like \t) BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685: Delete: mysql-test/r/ctype_tis620.result-old BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba: Delete: mysql-test/t/ctype_tis620.test-old client/mysqlbinlog.cc: Added DBUG statements Added call of my_end() to free all used memory on exit heap/hp_info.c: After merge fixes heap/hp_open.c: After merge fixes include/heap.h: After merge fixes include/m_ctype.h: Use pchar instead of 'int' for character parameters. Added 'my_binary_compare()' include/m_string.h: Fixed wrong define innobase/ibuf/ibuf0ibuf.c: After merge fixes innobase/srv/srv0start.c: After merge fixes mysql-test/r/alter_table.result: Fixed results after merge mysql-test/r/auto_increment.result: Fixed results after merge mysql-test/r/bdb.result: Fixed results after merge mysql-test/r/binary.result: Fixed results after merge mysql-test/r/create.result: Fixed results after merge mysql-test/r/ctype_mb.result: Fixed results after merge mysql-test/r/ctype_tis620.result: Fixed results after merge mysql-test/r/ctype_utf8.result: Fixed results after merge mysql-test/r/delete.result: Fixed results after merge mysql-test/r/func_compress.result: Fixed results after merge mysql-test/r/func_gconcat.result: Fixed results after merge mysql-test/r/func_group.result: Fixed results after merge mysql-test/r/func_str.result: Fixed results after merge mysql-test/r/innodb.result: Fixed results after merge mysql-test/r/insert.result: Fixed results after merge mysql-test/r/insert_select.result: Fixed results after merge mysql-test/r/key.result: Fixed results after merge mysql-test/r/loaddata.result: Fixed results after merge mysql-test/r/lock.result: Fixed results after merge mysql-test/r/myisam.result: Fixed results after merge mysql-test/r/null.result: Fixed results after merge mysql-test/r/null_key.result: Fixed results after merge mysql-test/r/order_by.result: Fixed results after merge mysql-test/r/query_cache.result: Fixed results after merge mysql-test/r/range.result: Fixed results after merge mysql-test/r/rpl_multi_delete.result: Fixed results after merge mysql-test/r/rpl_until.result: Fixed results after merge mysql-test/r/subselect.result: Fixed results after merge mysql-test/r/subselect_innodb.result: Fixed results after merge mysql-test/r/type_blob.result: Fixed results after merge mysql-test/r/type_datetime.result: Fixed results after merge mysql-test/r/type_decimal.result: Fixed results after merge mysql-test/r/type_enum.result: Fixed results after merge mysql-test/r/type_float.result: Fixed results after merge mysql-test/r/type_ranges.result: Fixed results after merge mysql-test/r/type_time.result: Fixed results after merge mysql-test/r/type_timestamp.result: Fixed results after merge mysql-test/r/type_uint.result: Fixed results after merge mysql-test/r/type_year.result: Fixed results after merge mysql-test/r/variables.result: Fixed results after merge mysql-test/r/warnings.result: Fixed results after merge mysql-test/t/case.test: Fixed shifted error messages mysql-test/t/create.test: Fixed shifted error messages mysql-test/t/ctype_collate.test: Fixed shifted error messages mysql-test/t/ctype_tis620.test: Merge with 4.0 ctype_tis620 test mysql-test/t/delete.test: Fixed shifted error messages mysql-test/t/derived.test: Fixed shifted error messages mysql-test/t/fulltext.test: Fixed shifted error messages mysql-test/t/func_in.test: Fixed shifted error messages mysql-test/t/func_str.test: Fixed shifted error messages mysql-test/t/func_test.test: Fixed shifted error messages mysql-test/t/grant.test: Fixed shifted error messages mysql-test/t/innodb.test: Change to 4.1 syntax mysql-test/t/key_cache.test: Fixed shifted error messages mysql-test/t/myisam.test: New test of blob and end space mysql-test/t/row.test: Fixed shifted error messages mysql-test/t/rpl_until.test: Fixed shifted error messages mysql-test/t/subselect.test: Fixed shifted error messages mysql-test/t/subselect_innodb.test: Fix test to take into account foreign key constraints mysql-test/t/union.test: Fixed shifted error messages mysql-test/t/user_var.test: Fixed shifted error messages mysql-test/t/variables.test: Fixed shifted error messages mysys/my_handler.c: Merge with 4.0 code sql/ha_heap.cc: After merge fixes sql/handler.cc: After merge fixes sql/item.cc: After merge fixes sql/item_cmpfunc.cc: Ensure that we are comparing end space with BINARY strings sql/item_cmpfunc.h: Ensure that we are comparing end space with BINARY strings sql/log_event.cc: More DBUG statements Ensure that we use all options to LOAD DATA in replication sql/opt_range.cc: After merge fixes sql/sql_db.cc: After merge fixes sql/sql_handler.cc: After merge fixes Use 'any_db' instead of '' to mean 'no database comparison' sql/sql_parse.cc: After merge fixes sql/sql_select.cc: After merge fixes Added function comment for setup_group() sql/sql_string.cc: Added stringcmp() for binary comparison. Added function comments for sortcmp() and stringcmp() sql/sql_string.h: Added stringcmp() sql/sql_table.cc: After merge fixes sql/sql_update.cc: After merge fixes sql/sql_yacc.yy: Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error. strings/ctype-big5.c: Strip only end space, not other space characters. strings/ctype-bin.c: Removed some not needed functions. Added function comments Don't remove end space in comparisons Change my_wildcmp_bin() to be 'identical' with other similar code strings/ctype-czech.c: Strip only end space, not other space characters. strings/ctype-gbk.c: Strip only end space, not other space characters. strings/ctype-latin1.c: Strip only end space, not other space characters. strings/ctype-mb.c: Strip only end space, not other space characters. strings/ctype-simple.c: Strip only end space, not other space characters. strings/ctype-sjis.c: Strip only end space, not other space characters. strings/ctype-tis620.c: Added usage of my_instr_simple. This needs to be cleaned up! strings/ctype-utf8.c: Strip only end space, not other space characters. strings/ctype-win1250ch.c: Strip only end space, not other space characters. Fixed indentation strings/strto.c: Code cleanup
210 lines
6.7 KiB
C
210 lines
6.7 KiB
C
/* Copyright (C) 2000 MySQL AB
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 2 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program; if not, write to the Free Software
|
||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||
|
||
/* This file should be included when using heap_database_functions */
|
||
/* Author: Michael Widenius */
|
||
|
||
#ifndef _heap_h
|
||
#define _heap_h
|
||
#ifdef __cplusplus
|
||
extern "C" {
|
||
#endif
|
||
|
||
#ifndef _my_base_h
|
||
#include <my_base.h>
|
||
#endif
|
||
#ifdef THREAD
|
||
#include <my_pthread.h>
|
||
#include <thr_lock.h>
|
||
#endif
|
||
|
||
#include "my_handler.h"
|
||
#include "my_tree.h"
|
||
|
||
/* defines used by heap-funktions */
|
||
|
||
#define HP_MAX_LEVELS 4 /* 128^5 records is enough */
|
||
#define HP_PTRS_IN_NOD 128
|
||
|
||
/* struct used with heap_funktions */
|
||
|
||
typedef struct st_heapinfo /* Struct from heap_info */
|
||
{
|
||
ulong records; /* Records in database */
|
||
ulong deleted; /* Deleted records in database */
|
||
ulong max_records;
|
||
ulong data_length;
|
||
ulong index_length;
|
||
uint reclength; /* Length of one record */
|
||
int errkey;
|
||
ulonglong auto_increment;
|
||
} HEAPINFO;
|
||
|
||
|
||
/* Structs used by heap-database-handler */
|
||
|
||
typedef struct st_heap_ptrs
|
||
{
|
||
byte *blocks[HP_PTRS_IN_NOD]; /* pointers to HP_PTRS or records */
|
||
} HP_PTRS;
|
||
|
||
struct st_level_info
|
||
{
|
||
uint free_ptrs_in_block,records_under_level;
|
||
HP_PTRS *last_blocks; /* pointers to HP_PTRS or records */
|
||
};
|
||
|
||
typedef struct st_heap_block /* The data is saved in blocks */
|
||
{
|
||
HP_PTRS *root;
|
||
struct st_level_info level_info[HP_MAX_LEVELS+1];
|
||
uint levels;
|
||
uint records_in_block; /* Records in a heap-block */
|
||
uint recbuffer; /* Length of one saved record */
|
||
ulong last_allocated; /* Blocks allocated, used by keys */
|
||
} HP_BLOCK;
|
||
|
||
struct st_heap_info; /* For referense */
|
||
|
||
typedef struct st_hp_keydef /* Key definition with open */
|
||
{
|
||
uint flag; /* HA_NOSAME |<7C>HA_NULL_PART_KEY */
|
||
uint keysegs; /* Number of key-segment */
|
||
uint length; /* Length of key (automatic) */
|
||
uint8 algorithm; /* HASH / BTREE */
|
||
HA_KEYSEG *seg;
|
||
HP_BLOCK block; /* Where keys are saved */
|
||
TREE rb_tree;
|
||
int (*write_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo,
|
||
const byte *record, byte *recpos);
|
||
int (*delete_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo,
|
||
const byte *record, byte *recpos, int flag);
|
||
uint (*get_key_length)(struct st_hp_keydef *keydef, const byte *key);
|
||
} HP_KEYDEF;
|
||
|
||
typedef struct st_heap_share
|
||
{
|
||
HP_BLOCK block;
|
||
HP_KEYDEF *keydef;
|
||
ulong min_records,max_records; /* Params to open */
|
||
ulong data_length,index_length;
|
||
uint records; /* records */
|
||
uint blength;
|
||
uint deleted; /* Deleted records in database */
|
||
uint reclength; /* Length of one record */
|
||
uint changed;
|
||
uint keys,max_key_length;
|
||
uint open_count;
|
||
byte *del_link; /* Link to next block with del. rec */
|
||
my_string name; /* Name of "memory-file" */
|
||
#ifdef THREAD
|
||
THR_LOCK lock;
|
||
pthread_mutex_t intern_lock; /* Locking for use with _locking */
|
||
#endif
|
||
my_bool delete_on_close;
|
||
LIST open_list;
|
||
uint auto_key;
|
||
uint auto_key_type; /* real type of the auto key segment */
|
||
ulonglong auto_increment;
|
||
} HP_SHARE;
|
||
|
||
struct st_hp_hash_info;
|
||
|
||
typedef struct st_heap_info
|
||
{
|
||
HP_SHARE *s;
|
||
byte *current_ptr;
|
||
struct st_hp_hash_info *current_hash_ptr;
|
||
ulong current_record,next_block;
|
||
int lastinx,errkey;
|
||
int mode; /* Mode of file (READONLY..) */
|
||
uint opt_flag,update;
|
||
byte *lastkey; /* Last used key with rkey */
|
||
byte *recbuf; /* Record buffer for rb-tree keys */
|
||
enum ha_rkey_function last_find_flag;
|
||
TREE_ELEMENT *parents[MAX_TREE_HEIGHT+1];
|
||
TREE_ELEMENT **last_pos;
|
||
uint lastkey_len;
|
||
my_bool implicit_emptied;
|
||
#ifdef THREAD
|
||
THR_LOCK_DATA lock;
|
||
#endif
|
||
LIST open_list;
|
||
} HP_INFO;
|
||
|
||
typedef struct st_heap_create_info
|
||
{
|
||
uint auto_key;
|
||
uint auto_key_type;
|
||
ulonglong auto_increment;
|
||
} HP_CREATE_INFO;
|
||
|
||
/* Prototypes for heap-functions */
|
||
|
||
extern HP_INFO *heap_open(const char *name, int mode);
|
||
extern int heap_close(HP_INFO *info);
|
||
extern int heap_write(HP_INFO *info,const byte *buff);
|
||
extern int heap_update(HP_INFO *info,const byte *old,const byte *newdata);
|
||
extern int heap_rrnd(HP_INFO *info,byte *buf,byte *pos);
|
||
extern int heap_scan_init(HP_INFO *info);
|
||
extern int heap_scan(register HP_INFO *info, byte *record);
|
||
extern int heap_delete(HP_INFO *info,const byte *buff);
|
||
extern int heap_info(HP_INFO *info,HEAPINFO *x,int flag);
|
||
extern int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
|
||
uint reclength, ulong max_records, ulong min_records,
|
||
HP_CREATE_INFO *create_info);
|
||
extern int heap_delete_table(const char *name);
|
||
extern int heap_extra(HP_INFO *info,enum ha_extra_function function);
|
||
extern int heap_rename(const char *old_name,const char *new_name);
|
||
extern int heap_panic(enum ha_panic_function flag);
|
||
extern int heap_rsame(HP_INFO *info,byte *record,int inx);
|
||
extern int heap_rnext(HP_INFO *info,byte *record);
|
||
extern int heap_rprev(HP_INFO *info,byte *record);
|
||
extern int heap_rfirst(HP_INFO *info,byte *record,int inx);
|
||
extern int heap_rlast(HP_INFO *info,byte *record,int inx);
|
||
extern void heap_clear(HP_INFO *info);
|
||
extern void heap_update_auto_increment(HP_INFO *info, const byte *record);
|
||
ha_rows hp_rb_records_in_range(HP_INFO *info, int inx, const byte *start_key,
|
||
uint start_key_len,
|
||
enum ha_rkey_function start_search_flag,
|
||
const byte *end_key, uint end_key_len,
|
||
enum ha_rkey_function end_search_flag);
|
||
int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key,
|
||
uint key_len, enum ha_rkey_function find_flag);
|
||
extern gptr heap_find(HP_INFO *info,int inx,const byte *key);
|
||
extern int heap_check_heap(HP_INFO *info, my_bool print_status);
|
||
extern byte *heap_position(HP_INFO *info);
|
||
|
||
/* The following is for programs that uses the old HEAP interface where
|
||
pointer to rows where a long instead of a (byte*).
|
||
*/
|
||
|
||
#if defined(WANT_OLD_HEAP_VERSION) || defined(OLD_HEAP_VERSION)
|
||
extern int heap_rrnd_old(HP_INFO *info,byte *buf,ulong pos);
|
||
extern ulong heap_position_old(HP_INFO *info);
|
||
#endif
|
||
#ifdef OLD_HEAP_VERSION
|
||
typedef ulong HEAP_PTR;
|
||
#define heap_position(A) heap_position_old(A)
|
||
#define heap_rrnd(A,B,C) heap_rrnd_old(A,B,C)
|
||
#else
|
||
typedef byte *HEAP_PTR;
|
||
#endif
|
||
|
||
#ifdef __cplusplus
|
||
}
|
||
#endif
|
||
#endif
|