database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merged

Browse Source
This commit is contained in:
serg@serg.mysql.com
2001-07-12 14:58:20 +02:00
parent c0b4b2360c 4271201868
commit 0bbd660c99
6 changed files with 383 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@@ -1,4 +1,5 @@
Sinisa@sinisa.nasamreza.org Sinisa@sinisa.nasamreza.org
davida@isil.mysql.com
heikki@donna.mysql.fi heikki@donna.mysql.fi
jani@hynda.mysql.fi jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi jani@janikt.pp.saunalahti.fi

570
Docs/manual.texi
View File

File diff suppressed because it is too large Load Diff

4
myisam/ft_update.c
View File

@@ -147,6 +147,10 @@ int _mi_ft_cmp(MI_INFO *info, uint keynr, const byte *rec1, const byte *rec2)
memcpy_fixed(&pos2,pos2+keyseg->bit_start,sizeof(char*)); memcpy_fixed(&pos2,pos2+keyseg->bit_start,sizeof(char*));
set_if_smaller(len2,keyseg->length); set_if_smaller(len2,keyseg->length);
} }
else /* fixed length key */
{
len1=len2=keyseg->length;
}
if ((len1 != len2) || memcmp(pos1, pos2, len1)) if ((len1 != len2) || memcmp(pos1, pos2, len1))
return THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT; return THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT;
} }

3
sql/log.cc
View File

@@ -820,10 +820,13 @@ bool MYSQL_LOG::write(Load_log_event* event_info)
VOID(pthread_cond_broadcast(&COND_binlog_update)); VOID(pthread_cond_broadcast(&COND_binlog_update));
} }
} }
if(should_rotate) if(should_rotate)
new_file(1); // inside mutex new_file(1); // inside mutex
VOID(pthread_mutex_unlock(&LOCK_log)); VOID(pthread_mutex_unlock(&LOCK_log));
} }
return error; return error;
} }