From 24603033e3249e266bd27cbfbc50b7c2517ec6a6 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Wed, 29 Oct 2014 22:20:58 -0400 Subject: MDEV-6939 : Dots in file names of configuration files Use fn_ext2() (backported from 10.0) to get the file extension from last occurrence of FN_EXTCHAR ('.') instead. --- include/my_sys.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/my_sys.h b/include/my_sys.h index da0462825eb..7e37fe598bd 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -672,6 +672,7 @@ extern my_bool has_path(const char *name); extern char *convert_dirname(char *to, const char *from, const char *from_end); extern void to_unix_path(char * name); extern char * fn_ext(const char *name); +extern char * fn_ext2(const char *name); extern char * fn_same(char * toname,const char *name,int flag); extern char * fn_format(char * to,const char *name,const char *dir, const char *form, uint flag); -- cgit v1.2.1 From 743e2ae433ca981bab5b2f74438e05d275245c8a Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Fri, 12 Dec 2014 17:10:51 -0500 Subject: MDEV-6891: Addendum, update company name in copyright notice --- include/welcome_copyright_notice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 875770edb89..956a9f1c17a 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -25,6 +25,6 @@ */ #define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \ "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR \ - ", Oracle, Monty Program Ab and others.\n" + ", Oracle, MariaDB Corporation Ab and others.\n" #endif /* _welcome_copyright_notice_h_ */ -- cgit v1.2.1 From 4a32d9c0580d6362cfcd86c6d8f103748946e580 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Mon, 15 Dec 2014 11:16:33 +0200 Subject: MDEV-6871 Multi-value insert on MyISAM table that makes slaves crash (when using --skip-external-locking=0) Problem was that repair() did lock and unlock tables, which leaved already locked tables in wrong state include/my_check_opt.h: Added option T_NO_LOCKS to disable locking during repair() Fixed duplicated bit T_NO_CREATE_RENAME_LSN mysql-test/suite/rpl/r/myisam_external_lock.result: Test case for MDEV-6871 mysql-test/suite/rpl/t/myisam_external_lock-slave.opt: Test case for MDEV-6871 mysql-test/suite/rpl/t/myisam_external_lock.test: Test case for MDEV-6871 storage/maria/ha_maria.cc: Don't lock tables during enable_indexes() Removed some calls to current_thd storage/myisam/ha_myisam.cc: Don't lock tables during enable_indexes() Removed some calls to current_thd --- include/my_check_opt.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/my_check_opt.h b/include/my_check_opt.h index abd4f4a96a7..f952792d2c8 100644 --- a/include/my_check_opt.h +++ b/include/my_check_opt.h @@ -63,7 +63,9 @@ extern "C" { #define T_ZEROFILL (1ULL << 32) #define T_ZEROFILL_KEEP_LSN (1ULL << 33) /** If repair should not bump create_rename_lsn */ -#define T_NO_CREATE_RENAME_LSN (1ULL << 33) +#define T_NO_CREATE_RENAME_LSN (1ULL << 34) +/** If repair shouldn't do any locks */ +#define T_NO_LOCKS (1ULL << 35) #define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL) -- cgit v1.2.1