- developers - lists.mariadb.org

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2775)
by knielsen＠knielsen-hq.org 26 Nov '09

26 Nov '09

#At lp:maria 2775 knielsen(a)knielsen-hq.org 2009-11-26 After-merge fix for MySQL 5.1.41 merge into MariaDB: Fix incorrect merge breaking the build. modified: unittest/mysys/Makefile.am === modified file 'unittest/mysys/Makefile.am' --- a/unittest/mysys/Makefile.am 2009-11-16 20:49:51 +0000 +++ b/unittest/mysys/Makefile.am 2009-11-26 08:44:38 +0000 @@ -18,15 +18,13 @@ INCLUDES = @ZLIB_INCLUDES@ -I$(top_buil noinst_HEADERS = thr_template.c -noinst_PROGRAMS = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t - LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a EXTRA_DIST = CMakeLists.txt -noinst_PROGRAMS = bitmap-t base64-t +noinst_PROGRAMS = bitmap-t base64-t lf-t waiting_threads-t if NEED_THREAD # my_atomic-t is used to check thread functions, so it is safe to

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2774)
by knielsen＠knielsen-hq.org 26 Nov '09

26 Nov '09

#At lp:maria 2774 knielsen(a)knielsen-hq.org 2009-11-26 After-merge fixes for merge of MySQL 5.1.41 into MariaDB: more post-shutdown warning fixes. modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-11-26 07:45:54 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-11-26 08:02:33 +0000 @@ -3992,7 +3992,8 @@ sub extract_warning_lines ($) { qr/Setting lower_case_table_names=2/, qr/deprecated/, qr/Slave SQL thread retried transaction/, - qw/Slave $additional info$/, + qr/Slave $additional info$/, + qr/Incorrect information in file/, ); my $match_count= 0;

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2773)
by knielsen＠knielsen-hq.org 26 Nov '09

26 Nov '09

#At lp:maria 2773 knielsen(a)knielsen-hq.org 2009-11-26 After-merge fix for MySQL 5.1.41 merge into MariaDB: Another warning antipattern also needed during shutdown. modified: mysql-test/mysql-test-run.pl === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-11-25 11:06:01 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-11-26 07:45:54 +0000 @@ -3989,6 +3989,7 @@ sub extract_warning_lines ($) { qr/unknown option '--loose-/, qr/unknown variable 'loose-/, qr/Now setting lower_case_table_names to [02]/, + qr/Setting lower_case_table_names=2/, qr/deprecated/, qr/Slave SQL thread retried transaction/, qw/Slave $additional info$/,

1 0

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2767: Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build) maria do not builds
by noreply＠launchpad.net 26 Nov '09

26 Nov '09

------------------------------------------------------------ revno: 2767 committer: Michael Widenius <monty(a)askmonty.org> branch nick: maria-5.1 timestamp: Thu 2009-11-26 01:18:23 +0200 message: Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build) maria do not builds Added 'mariadb_SERVER' as extra config group for MariaDB embedded server modified: client/mysql.cc mysys/thr_mutex.c -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2767)
by Michael Widenius 26 Nov '09

26 Nov '09

#At lp:maria based on revid:monty@askmonty.org-20091125073628-7fekfnr2hmkbjos1 2767 Michael Widenius 2009-11-26 Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build) maria do not builds Added 'mariadb_SERVER' as extra config group for MariaDB embedded server modified: client/mysql.cc mysys/thr_mutex.c per-file messages: client/mysql.cc Cleanup Added 'mariadb_SERVER' as extra config group for MariaDB embedded server mysys/thr_mutex.c Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build) maria do not builds === modified file 'client/mysql.cc' --- a/client/mysql.cc 2009-11-06 17:22:32 +0000 +++ b/client/mysql.cc 2009-11-25 23:18:23 +0000 @@ -83,7 +83,7 @@ extern "C" { #include <term.h> #endif #endif -#endif +#endif /* defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) */ #undef bcmp // Fix problem with new readline #if defined(__WIN__) @@ -92,7 +92,6 @@ extern "C" { #include <readline/readline.h> #define HAVE_READLINE #endif - //int vidattr(long unsigned int attrs); // Was missing in sun curses } #if !defined(HAVE_VIDATTR) @@ -1024,7 +1023,7 @@ static const char *load_default_groups[] static int embedded_server_arg_count= 0; static char *embedded_server_args[MAX_SERVER_ARGS]; static const char *embedded_server_groups[]= -{ "server", "embedded", "mysql_SERVER", 0 }; +{ "server", "embedded", "mysql_SERVER", "mariadb_SERVER", 0 }; #ifdef HAVE_READLINE /* === modified file 'mysys/thr_mutex.c' --- a/mysys/thr_mutex.c 2009-06-22 08:06:35 +0000 +++ b/mysys/thr_mutex.c 2009-11-25 23:18:23 +0000 @@ -36,6 +36,7 @@ #undef pthread_mutex_init #undef pthread_mutex_lock #undef pthread_mutex_unlock +#undef pthread_mutex_trylock #undef pthread_mutex_destroy #undef pthread_cond_wait #undef pthread_cond_timedwait @@ -838,31 +839,9 @@ static void print_deadlock_warning(safe_ DBUG_VOID_RETURN; } +#elif defined(MY_PTHREAD_FASTMUTEX) -#endif /* THREAD && SAFE_MUTEX */ - -#if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) - -#include "mysys_priv.h" -#include "my_static.h" -#include <m_string.h> - -#include <m_ctype.h> -#include <hash.h> -#include <myisampack.h> -#include <mysys_err.h> -#include <my_sys.h> - -#undef pthread_mutex_t -#undef pthread_mutex_init -#undef pthread_mutex_lock -#undef pthread_mutex_trylock -#undef pthread_mutex_unlock -#undef pthread_mutex_destroy -#undef pthread_cond_wait -#undef pthread_cond_timedwait - -ulong mutex_delay(ulong delayloops) +static ulong mutex_delay(ulong delayloops) { ulong i; volatile ulong j; @@ -943,6 +922,6 @@ void fastmutex_global_init(void) cpu_count= sysconf(_SC_NPROCESSORS_CONF); #endif } - -#endif /* SAFE_MUTEX_DEFINED */ + +#endif /* defined(MY_PTHREAD_FASTMUTEX) */ #endif /* THREAD */

1 0

[Maria-developers] New (by Sanja): Subquery optimization: Avoid recalculating subquery if external fields values found in subquery cache (66)
by worklog-noreply＠askmonty.org 25 Nov '09

25 Nov '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Subquery optimization: Avoid recalculating subquery if external fields values found in subquery cache CREATION DATE..: Wed, 25 Nov 2009, 22:25 SUPERVISOR.....: Monty IMPLEMENTOR....: Sanja COPIES TO......: CATEGORY.......: Server-BackLog TASK ID........: 66 (http://askmonty.org/worklog/?tid=66) VERSION........: Server-5.2 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Collect all outer items/references (left part of the subquiery and outer references inside the subquery) in key string. Compare the string (which represents certain value set of the references) against values in hash table and return cached result of subquery if the reference values combination has already been used. For example in the following subquery: (L1, L2) IN (SELECT A, B FROM T WHERE T.F1>OTER_FIELD) set of references to look into the subquery cache is (L1, L2, OTER_FIELD). The subquery cache should be implemented as simple LRU connected to the subquery. Size of the subquery cache (in number of results (but maybe in used memory amount)) is limited by session variable (query parameter?). ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] New (by Sanja): Subquery optimization: Avoid recalculating subquery if external fields values found in subquery cache (66)
by worklog-noreply＠askmonty.org 25 Nov '09

25 Nov '09

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Subquery optimization: Avoid recalculating subquery if external fields values found in subquery cache CREATION DATE..: Wed, 25 Nov 2009, 22:25 SUPERVISOR.....: Monty IMPLEMENTOR....: Sanja COPIES TO......: CATEGORY.......: Server-BackLog TASK ID........: 66 (http://askmonty.org/worklog/?tid=66) VERSION........: Server-5.2 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Collect all outer items/references (left part of the subquiery and outer references inside the subquery) in key string. Compare the string (which represents certain value set of the references) against values in hash table and return cached result of subquery if the reference values combination has already been used. For example in the following subquery: (L1, L2) IN (SELECT A, B FROM T WHERE T.F1>OTER_FIELD) set of references to look into the subquery cache is (L1, L2, OTER_FIELD). The subquery cache should be implemented as simple LRU connected to the subquery. Size of the subquery cache (in number of results (but maybe in used memory amount)) is limited by session variable (query parameter?). ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] WL47: Second suggestion.
by Alexi1952 25 Nov '09

25 Nov '09

Having to start with WL47 which already contains the 'First suggestion', I'd like to discuss: Second suggestion ~~~~~~~~~~~~~~~~~ Add query text to the RBR events data part (together with adding query_len field to their header). Reason (compared with the First suggestion): - this makes binary log bit smaller (no need to store headers of new events). - almost all changes needed in this case are localized in the RBR-event classes (e.g. replication, being, roughly speaking, based on calling the apply_event() and other Log_event methods, shouldn't care about whether there is a query_text in the event or not). We can recognize whether an RBR-event in a binary log contain query text or not by looking at it header length in the Format description event (the post_header member): containing the additional query_len field, the header of the 'extended' event have a diferent size. Because we are able to recognize RBR-events format _only_ by the Format description event (at the beginning of the binary log), we can not allow to mix in one binary log both 'standard' and 'extended' formats (which is possible within the First suggestion). If possibility of such a mix is important then we should prefer the First suggestion. Any remarks ? Which way to go ?

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2772)
by knielsen＠knielsen-hq.org 25 Nov '09

25 Nov '09

#At lp:maria 2772 knielsen(a)knielsen-hq.org 2009-11-25 After-merge fixes following Merge of Mysql 5.1.41 into MariaDB: Fix path for SSL stuff when running testsuite from installed package. modified: mysql-test/lib/My/ConfigFactory.pm === modified file 'mysql-test/lib/My/ConfigFactory.pm' --- a/mysql-test/lib/My/ConfigFactory.pm 2009-11-16 20:49:51 +0000 +++ b/mysql-test/lib/My/ConfigFactory.pm 2009-11-25 13:00:28 +0000 @@ -142,8 +142,7 @@ sub fix_secure_file_priv { sub fix_std_data { my ($self, $config, $group_name, $group)= @_; - my $basedir= $self->get_basedir($group); - return "$basedir/mysql-test/std_data"; + return "$::opt_vardir/std_data"; } sub ssl_supported {

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2771)
by knielsen＠knielsen-hq.org 25 Nov '09

25 Nov '09

#At lp:maria 2771 knielsen(a)knielsen-hq.org 2009-11-25 After-merge fix for merge of MySQL 5.1.41 into MariaDB: Valgrind fixes. modified: mysql-test/mysql-test-run.pl sql/log_event.cc per-file messages: mysql-test/mysql-test-run.pl Fix Valgrind warnings: add more post-shutdown warning suppressions, and revert bad previous change. sql/log_event.cc Manually apply fix for Bug#48340 (basically missing initialisation of thd->lex->local_file in Load_log_event::do_apply_event()) === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-11-24 09:34:42 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-11-25 11:06:01 +0000 @@ -223,7 +223,7 @@ my $opt_strace_client; our $opt_user = "root"; my $opt_valgrind= 0; -my $opt_valgrind_mysqld= 0; +our $opt_valgrind_mysqld= 0; my $opt_valgrind_mysqltest= 0; my @default_valgrind_args= ("--show-reachable=yes"); my @valgrind_args; @@ -3990,6 +3990,8 @@ sub extract_warning_lines ($) { qr/unknown variable 'loose-/, qr/Now setting lower_case_table_names to [02]/, qr/deprecated/, + qr/Slave SQL thread retried transaction/, + qw/Slave $additional info$/, ); my $match_count= 0; === modified file 'sql/log_event.cc' --- a/sql/log_event.cc 2009-11-16 20:49:51 +0000 +++ b/sql/log_event.cc 2009-11-25 11:06:01 +0000 @@ -4509,6 +4509,7 @@ int Load_log_event::do_apply_event(NET* as the present method does not call mysql_parse(). */ lex_start(thd); + thd->lex->local_file= local_fname; mysql_reset_thd_for_next_command(thd); if (!use_rli_only_for_errors)

1 0