mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f01f49916b
Fixed bugs in my last changeset that made MySQL hard to compile. Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables. Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions Extended my_chsize() to allow one to specify a filler character. Extend vio_blocking to return the old state (This made some usage of this function much simpler) Added testing for some functions that they caller have got the required mutexes before calling the function. Use setrlimit() to ensure that we can write core file if one specifies --core-file. Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len Added variables foreign_key_checks & unique_checks. Less logging from replication code (if not started with --log-warnings) Changed that SHOW INNODB STATUS requre the SUPER privilege More DBUG statements and a lot of new code comments BitKeeper/deleted/.del-rpl_compat.result~c950bc346b12c61a: Delete: mysql-test/r/rpl_compat.result BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f: Delete: mysql-test/t/rpl_compat.test Docs/manual.texi: Updated manual with fixes in this changeset client/mysqltest.c: Indentation cleanup Better error messages for some error conditions. include/my_pthread.h: Added 'safe_mutex_assert_owner()' to check that the thread really owns the mutex. include/my_sys.h: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) include/raid.h: New my_chsize() include/violite.h: Extend vio_blocking to return the old state innobase/include/dyn0dyn.h: Merge with 3.23 (AIX DYN_ARRAY_DATA_SIZE) innobase/include/dyn0dyn.ic: Merge with 3.23 isam/create.c: Fix for new my_chsize() isam/isamchk.c: Fix for new my_chsize() isam/pack_isam.c: Fix for new my_chsize() libmysql/manager.c: Fix for new vio_blocking() libmysqld/lib_sql.cc: Fix for new open_log() myisam/mi_cache.c: Fix typo from previous checking myisam/mi_check.c: Fix for new my_chsize() myisam/mi_create.c: Fix for new my_chsize() myisam/mi_delete_all.c: Fix for new my_chsize() myisam/myisampack.c: Fix for new my_chsize() mysql-test/include/master-slave.inc: Better initialization for replication tests mysql-test/mysql-test-run.sh: Added option --log-warnings mysql-test/r/insert.result: More tests if INSERT ...(DEFAULT) mysql-test/r/rpl000001.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000002.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000003.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000004.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000005.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000006.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000007.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000008.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000009.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000010.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000011.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000012.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000013.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000014.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_alter.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_empty_master_crash.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_get_lock.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_log.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_magic.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_mystery22.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_skip_error.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_sporadic_master.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/insert.test: More tests if INSERT ...(DEFAULT) mysql-test/t/rpl000001.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000002.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000003.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000004.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000005.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000006.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000007.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000009.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000011.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000013.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000014.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_alter.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_empty_master_crash.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_get_lock.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_magic.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_mystery22.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_skip_error.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_sporadic_master.test: Clean up tests for new master-slave.inc Remove 'use database' mysys/mf_iocache.c: More debug info Force seek after reinit_io_cache() mysys/mf_iocache2.c: Added my_b_filelength() mysys/my_chsize.c: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) mysys/raid.cc: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) sql/field.h: Fix for INSERT ... (DEFAULT) sql/ha_berkeley.h: Fix for dynamic variables sql/ha_innodb.cc: Change sprintf() to my_sprintf() to make code portable. Fix after sync with 3.23 (We still need to fix the storage of the replication position in innodb) sql/ha_innodb.h: Fix for dynamic variables sql/handler.cc: Remove writting of COMMIT to the binary log. (Now done in MYSQL_LOG::write()) sql/item_func.cc: Query_log_event() now always takes query length. sql/item_func.h: Indentation cleanup sql/item_strfunc.h: Indentation cleanup sql/item_timefunc.h: Indentation cleanup sql/lock.cc: Check that we own critical mutexes. sql/log.cc: Big code cleanup / rewrite / optimize. - The index log file has its own IO_CACHE object. - Many functions totally rewritten to make them smaller and faster. - New handling of index log files - Lots of new comments sql/log_event.cc: Code cleanup New comments sql/log_event.h: Query_log_event() now always takes query length. sql/mini_client.cc: Better error messages on reconnect. Fixed wrong variable usage from last commit. sql/mysql_priv.h: New arguments to open_log() sql/mysqld.cc: Use setrlimit() to ensure that we can write core file if one specifies --core-file Added index file name as parameter to openlog(). Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len sql/net_serv.cc: Use new vio_blocking() (The vio_blocking() change was done to make this code more readable) sql/repl_failsafe.cc: Minor code cleanup sql/set_var.cc: Added variables slave_compressed_protocol, foreign_key_checks & unique_checks. sql/set_var.h: Generalization sql/slave.cc: Code cleanup & rewrite. Dont call SELECT VERSION() on check_master_version() New init_slave() code. Ensure that all threads create a THD early. Add locks around manipulation of critical structures Don't retry a command more than master_retry_count times. Write less warnings to the log file (if not started with --log-warnings) Faster flush_relay_log_info() sql/slave.h: More comments Added new arguments to some functions. sql/sql_acl.cc: More DBUG info New parameter to Query_log_event() sql/sql_base.cc: Added some mutex checking. sql/sql_cache.cc: Less not critical debug info sql/sql_class.h: Fix for new log handling. sql/sql_db.cc: Added mutex around remove_db_from_cache() sql/sql_delete.cc: Added missing parameters to changed functions sql/sql_insert.cc: Added missing parameters to changed functions sql/sql_parse.cc: Do an 'end_active_trans()' before 'load_master_data' Changed that SHOW INNODB STATUS requre the SUPER privilege Added new function parameters to new functions sql/sql_rename.cc: Added missing parameters to changed functions sql/sql_repl.cc: Code cleanups / new comments Fix for new find_first_log() calling standard. More DBUG statements. Show binlogs updated to use new IO_CACHE:d index log file. sql/sql_repl.h: New function arguments sql/sql_select.cc: Indentation changes sql/sql_table.cc: Added missing parameters to changed functions Added checking of mutex Added mutex around critical regions. sql/sql_test.cc: Don't use THR_ALARM if the configuration doesn't support it. sql/sql_update.cc: Added missing parameters to changed functions sql/table.cc: Added missing parameters to changed functions vio/vio.c: Extend vio_blocking to return the old state vio/viosocket.c: Extend vio_blocking to return the old state vio/viossl.c: Extend vio_blocking to return the old state
158 lines
5.7 KiB
C++
158 lines
5.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 */
|
|
|
|
/* Parser needs these defines always, even if USE_RAID is not defined */
|
|
#define RAID_TYPE_0 1 /* Striping */
|
|
#define RAID_TYPE_x 2 /* Some new modes */
|
|
#define RAID_TYPE_y 3
|
|
|
|
#define RAID_DEFAULT_CHUNKS 4
|
|
#define RAID_DEFAULT_CHUNKSIZE 256*1024 /* 256kB */
|
|
|
|
C_MODE_START
|
|
#define my_raid_type(raid_type) raid_type_string[(int)(raid_type)]
|
|
extern const char *raid_type_string[];
|
|
C_MODE_END
|
|
|
|
#ifdef DONT_USE_RAID
|
|
#undef USE_RAID
|
|
#endif
|
|
#if defined(USE_RAID)
|
|
|
|
#ifdef __GNUC__
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
#include "my_dir.h"
|
|
|
|
/* Trap all occurences of my_...() in source and use our wrapper around this function */
|
|
|
|
#ifdef MAP_TO_USE_RAID
|
|
#define my_read(A,B,C,D) my_raid_read(A,B,C,D)
|
|
#define my_write(A,B,C,D) my_raid_write(A,B,C,D)
|
|
#define my_pwrite(A,B,C,D,E) my_raid_pwrite(A,B,C,D,E)
|
|
#define my_pread(A,B,C,D,E) my_raid_pread(A,B,C,D,E)
|
|
#define my_chsize(A,B,C,D) my_raid_chsize(A,B,C,D)
|
|
#define my_close(A,B) my_raid_close(A,B)
|
|
#define my_tell(A,B) my_raid_tell(A,B)
|
|
#define my_seek(A,B,C,D) my_raid_seek(A,B,C,D)
|
|
#define my_lock(A,B,C,D,E) my_raid_lock(A,B,C,D,E)
|
|
#define my_fstat(A,B,C) my_raid_fstat(A,B,C)
|
|
#endif /* MAP_TO_USE_RAID */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
void init_raid(void);
|
|
void end_raid(void);
|
|
|
|
bool is_raid(File fd);
|
|
File my_raid_create(const char *FileName, int CreateFlags, int access_flags,
|
|
uint raid_type, uint raid_chunks, ulong raid_chunksize,
|
|
myf MyFlags);
|
|
File my_raid_open(const char *FileName, int Flags,
|
|
uint raid_type, uint raid_chunks, ulong raid_chunksize,
|
|
myf MyFlags);
|
|
int my_raid_rename(const char *from, const char *to, uint raid_chunks,
|
|
myf MyFlags);
|
|
int my_raid_delete(const char *from, uint raid_chunks, myf MyFlags);
|
|
int my_raid_redel(const char *old_name, const char *new_name,
|
|
uint raid_chunks, myf MyFlags);
|
|
|
|
my_off_t my_raid_seek(File fd, my_off_t pos, int whence, myf MyFlags);
|
|
my_off_t my_raid_tell(File fd, myf MyFlags);
|
|
|
|
uint my_raid_write(File,const byte *Buffer, uint Count, myf MyFlags);
|
|
uint my_raid_read(File Filedes, byte *Buffer, uint Count, myf MyFlags);
|
|
|
|
uint my_raid_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset,
|
|
myf MyFlags);
|
|
uint my_raid_pwrite(int Filedes, const byte *Buffer, uint Count,
|
|
my_off_t offset, myf MyFlags);
|
|
|
|
int my_raid_lock(File,int locktype, my_off_t start, my_off_t length,
|
|
myf MyFlags);
|
|
int my_raid_chsize(File fd, my_off_t newlength, int filler, myf MyFlags);
|
|
int my_raid_close(File, myf MyFlags);
|
|
int my_raid_fstat(int Filedes, struct stat *buf, myf MyFlags);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
|
|
class RaidName {
|
|
public:
|
|
RaidName(const char *FileName);
|
|
~RaidName();
|
|
bool IsRaid();
|
|
int Rename(const char * from, const char * to, myf MyFlags);
|
|
private:
|
|
uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
|
|
uint _raid_chunks; /* 1..n */
|
|
ulong _raid_chunksize; /* 1..n in bytes */
|
|
};
|
|
|
|
class RaidFd {
|
|
public:
|
|
RaidFd(uint raid_type, uint raid_chunks , ulong raid_chunksize);
|
|
~RaidFd();
|
|
File Create(const char *FileName, int CreateFlags, int access_flags,
|
|
myf MyFlags);
|
|
File Open(const char *FileName, int Flags, myf MyFlags);
|
|
my_off_t Seek(my_off_t pos,int whence,myf MyFlags);
|
|
my_off_t Tell(myf MyFlags);
|
|
int Write(const byte *Buffer, uint Count, myf MyFlags);
|
|
int Read(const byte *Buffer, uint Count, myf MyFlags);
|
|
int Lock(int locktype, my_off_t start, my_off_t length, myf MyFlags);
|
|
int Chsize(File fd, my_off_t newlength, int filler, myf MyFlags);
|
|
int Fstat(int fd, MY_STAT *stat_area, myf MyFlags );
|
|
int Close(myf MyFlags);
|
|
static bool IsRaid(File fd);
|
|
static DYNAMIC_ARRAY _raid_map; /* Map of RaidFD* */
|
|
private:
|
|
|
|
uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */
|
|
uint _raid_chunks; /* 1..n */
|
|
ulong _raid_chunksize; /* 1..n in bytes */
|
|
|
|
ulong _total_block; /* We are operating with block no x (can be 0..many). */
|
|
uint _this_block; /* can be 0.._raid_chunks */
|
|
uint _remaining_bytes; /* Maximum bytes that can be written in this block */
|
|
|
|
my_off_t _position;
|
|
my_off_t _size; /* Cached file size for faster seek(SEEK_END) */
|
|
File _fd;
|
|
File *_fd_vector; /* Array of File */
|
|
off_t *_seek_vector; /* Array of cached seek positions */
|
|
|
|
inline void Calculate()
|
|
{
|
|
DBUG_ENTER("RaidFd::_Calculate");
|
|
DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu",
|
|
(ulong) _position, _raid_chunksize, (ulong) _size));
|
|
|
|
_total_block = (ulong) (_position / _raid_chunksize);
|
|
_this_block = _total_block % _raid_chunks; /* can be 0.._raid_chunks */
|
|
_remaining_bytes = (uint) (_raid_chunksize -
|
|
(_position - _total_block * _raid_chunksize));
|
|
DBUG_PRINT("info",
|
|
("_total_block: %d this_block: %d _remaining_bytes:%d",
|
|
_total_block, _this_block, _remaining_bytes));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
};
|
|
|
|
#endif /* __cplusplus */
|
|
#endif /* USE_RAID */
|