mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
8f2482d283
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT Changed fn_ext to point at first '.' after directory. FLUSH LOGS removed numerical extension for all future update logs. Fixed the mysqld --help reports right values for --datadir and --bind-address --log-binary=a.b.c now properly strips of .b.c Fix that one can DROP UDF functions that was not loaded at startup Made AND optional in REQUIRE Added REQUIRE NONE BitKeeper/deleted/.del-CodingStyle~1ba7ff62d4cd0ea: Delete: vio/docs/CodingStyle BitKeeper/deleted/.del-COPYING.dbug~ca0c017a4d7e8609: Delete: vio/docs/COPYING.dbug BitKeeper/deleted/.del-COPYING.mysql~471498c82977cd3a: Delete: vio/docs/COPYING.mysql BitKeeper/deleted/.del-README~947354991dc882f8: Delete: vio/docs/README Docs/manual.texi: Changelog acinclude.m4: Fixed searching after ssl directories. client/Makefile.am: Moved openssl include to avoid problem with installed readline include/Makefile.am: Install my_global.h include/violite.h: Fixed that GRANT ... REQUIRE options are not forgot when doing new grant libmysqld/examples/Makefile.am: Moved openssl include to avoid problem with installed readline mysql-test/mysql-test-run.sh: Improved 'which' handling to give error if command is not found mysys/mf_fn_ext.c: Changed fn_ext to point at first '.' after directory. sql/Makefile.am: More comments sql/lex.h: Added NONE as keyword sql/log.cc: FLUSH LOGS removed numerical extension for all future update logs. Simple code cleanup sql/mysqld.cc: Fixed the --help reports right values for --datadir and --bind-address --log-binary=a.b.c now properly strips of .b.c Removed option --skip-external-locking (not needed as this is automatic) sql/repl_failsafe.cc: Moved some common THD initalization to store_globals() sql/slave.cc: Moved openssl include to avoid problem with installed readline sql/sql_acl.cc: Moved openssl include to avoid problem with installed readline sql/sql_acl.h: Updated function prototypes sql/sql_base.cc: Added comment sql/sql_class.cc: Moved openssl include to avoid problem with installed readline. Changed THD::thd to make things work for main thread. sql/sql_class.h: Fixed wrongly removed line (fixes compiler problem on MacOSX) sql/sql_insert.cc: Moved openssl include to avoid problem with installed readline sql/sql_lex.cc: Moved save_to_cache_query=0 to udf detection function to make sql_yacc.yy simpler sql/sql_lex.h: Indentation cleanup sql/sql_parse.cc: Moved openssl include to avoid problem with installed readline. Added THD argument to acl_reload() sql/sql_repl.h: Made opt_bin_logname static sql/sql_udf.cc: Fix that one can DROP UDF functions that was not loaded at startup sql/sql_yacc.yy: made AND optional in REQUIRE Added REQUIRE NONE Fixed that old SSL options are not forgotten when doing new GRANT. sql/udf_example.cc: Improved comments
55 lines
1.7 KiB
C
55 lines
1.7 KiB
C
#include "slave.h"
|
|
|
|
typedef struct st_slave_info
|
|
{
|
|
uint32 server_id;
|
|
uint32 rpl_recovery_rank, master_id;
|
|
char host[HOSTNAME_LENGTH+1];
|
|
char user[USERNAME_LENGTH+1];
|
|
char password[HASH_PASSWORD_LENGTH+1];
|
|
uint16 port;
|
|
THD* thd;
|
|
} SLAVE_INFO;
|
|
|
|
extern my_bool opt_show_slave_auth_info, opt_old_rpl_compat;
|
|
extern char *master_host, *master_info_file;
|
|
extern bool server_id_supplied;
|
|
extern I_List<i_string> binlog_do_db, binlog_ignore_db;
|
|
|
|
extern int max_binlog_dump_events;
|
|
extern my_bool opt_sporadic_binlog_dump_fail;
|
|
|
|
#define KICK_SLAVE(thd) { pthread_mutex_lock(&(thd)->LOCK_delete); (thd)->awake(0 /* do not prepare to die*/); pthread_mutex_unlock(&(thd)->LOCK_delete); }
|
|
|
|
File open_binlog(IO_CACHE *log, const char *log_file_name,
|
|
const char **errmsg);
|
|
|
|
int start_slave(THD* thd, MASTER_INFO* mi, bool net_report);
|
|
int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report);
|
|
int change_master(THD* thd, MASTER_INFO* mi);
|
|
int show_binlog_events(THD* thd);
|
|
int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1,
|
|
const char* log_file_name2, ulonglong log_pos2);
|
|
int reset_slave(THD *thd, MASTER_INFO* mi);
|
|
int reset_master(THD* thd);
|
|
int purge_master_logs(THD* thd, const char* to_log);
|
|
bool log_in_use(const char* log_name);
|
|
void adjust_linfo_offsets(my_off_t purge_offset);
|
|
int show_binlogs(THD* thd);
|
|
extern int init_master_info(MASTER_INFO* mi);
|
|
void kill_zombie_dump_threads(uint32 slave_server_id);
|
|
int check_binlog_magic(IO_CACHE* log, const char** errmsg);
|
|
|
|
typedef struct st_load_file_info
|
|
{
|
|
THD* thd;
|
|
sql_exchange* ex;
|
|
List <Item> *fields;
|
|
enum enum_duplicates handle_dup;
|
|
char* db;
|
|
char* table_name;
|
|
bool wrote_create_file;
|
|
my_off_t last_pos_in_file;
|
|
} LOAD_FILE_INFO;
|
|
|
|
int log_loaded_block(IO_CACHE* file);
|