mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-maria

Browse source 
into  mysql.com:/home/my/mysql-maria
This commit is contained in:
unknown 2008-03-04 02:46:51 +02:00
commit 79ca1004cb
3 changed files with 80 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dbug/dbug.c
View file

@ -276,7 +276,7 @@ typedef struct _db_code_state_ {
static struct link *ListAddDel(struct link *, const char *, const char *, int);
static struct link *ListCopy(struct link *);
static int InList(struct link *linkp,const char *cp);
static int ListFlags(struct link *linkp);
static uint ListFlags(struct link *linkp);
static void FreeList(struct link *linkp);
/* OpenClose debug output stream */
@ -738,10 +738,10 @@ void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
#define fflags(cs) cs->stack->out_file ? ListFlags(cs->stack->functions) : TRACE_ON;
void FixTraceFlags(int old_fflags, CODE_STATE *cs)
void FixTraceFlags(uint old_fflags, CODE_STATE *cs)
{
const char *func;
int new_fflags, traceon, level;
uint new_fflags, traceon, level;
struct _db_stack_frame_ *framep;
/*
@ -831,7 +831,7 @@ yuck:
void _db_set_(const char *control)
{
CODE_STATE *cs;
int old_fflags;
uint old_fflags;
get_code_state_or_return;
old_fflags=fflags(cs);
if (ParseDbug(cs, control))
@ -859,7 +859,7 @@ void _db_set_(const char *control)
void _db_push_(const char *control)
{
CODE_STATE *cs;
int old_fflags;
uint old_fflags;
get_code_state_or_return;
old_fflags=fflags(cs);
PushState(cs);
@ -910,7 +910,7 @@ void _db_set_init_(const char *control)
void _db_pop_()
{
struct settings *discard;
int old_fflags;
uint old_fflags;
CODE_STATE *cs;
get_code_state_or_return;
@ -1559,9 +1559,9 @@ static int InList(struct link *linkp, const char *cp)
*
*/
static int ListFlags(struct link *linkp)
static uint ListFlags(struct link *linkp)
{
int f;
uint f;
for (f=0; linkp != NULL; linkp= linkp->next_link)
f|= linkp->flags;
return f;

71
storage/maria/file_formats.txt Normal file
View file

@ -0,0 +1,71 @@
#
# This should contain a description of the file format for most Maria files
#
# Description of the header in the index file
Header, 24 bytes
Pos Length
0 4 file_version
4 2 options
6 2 header_length
8 2 state_info_length
10 2 base_info_length
12 2 base_pos
14 2 key_parts
16 2 unique_key_parts
18 1 keys
19 1 uniques
20 1 language
21 1 fulltext_keys
22 1 data_file_type
23 1 org_data_file_type
Status part
24 2 open_count
26 2 state_changed
28 7 create_rename_lsn
7 is_of_horizon
7 skip_redo_lsn
8 state.records
8 state->state.del
8 state->split
8 state->dellink
8 state->first_bitmap_with_space
8 state->state.key_file_length
8 state->state.data_file_length
8 state->state.empty
8 state->state.key_empty
8 state->auto_increment
8 state->state.checksum
4 state->process
4 state->unique
4 state->status
4 state->update_count
1 state->sortkey
1 reserved
for each key
8 state->key_root[i]
8 state->key_del
4 state->sec_index_changed
4 state->sec_index_used
4 state->version
8 state->key_map
8 state->create_time
8 state->recover_time
8 state->check_time
8 state->records_at_analyze
for each key
4 reserved
for each key part
8 state->rec_per_key_part[i]
4 state->nulls_per_key_part[i]

2
strings/bmove512.c
View file

@ -33,7 +33,7 @@
#ifdef HAVE_LONG_LONG
#define LONG ulonglong
#else
#define LONG ulonglong
#define LONG ulong
#endif
void bmove512(uchar *to, const uchar *from, register size_t length)