date:20090707

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2716)

2009-07-07 Thread knielsen

#At lp:maria

 2716 kniel...@knielsen-hq.org  2009-07-07
  Solaris 10 build script fixes by Toby Thain.
  
  Added build scripts for 32 bit x86 architecture on Solaris.
  Renamed some scripts for consistency.
  Changed to dynamic linking of libgcc.
  removed:
BUILD/compile-solaris-amd64-forte-debug
  added:
BUILD/compile-solaris-amd64-debug-forte
BUILD/compile-solaris-x86-32
BUILD/compile-solaris-x86-32-debug
BUILD/compile-solaris-x86-32-debug-forte
BUILD/compile-solaris-x86-forte-32
  modified:
BUILD/compile-solaris-amd64
BUILD/compile-solaris-amd64-debug

per-file messages:
  BUILD/compile-solaris-amd64
Changed to dynamic linking of libgcc.

The -static-libgcc was a legacy of the original build scripts. -R
(analogous to -L link time search path) is a Solaris mechanism to
ensure a needed lib directory is searched at runtime.

In Solaris 10, gcc comes bundled, under /usr/sfw, allowing to use it without
creating dependency problems. This allows eg. benefiting from ordinary 
system
patch maintenance.
  BUILD/compile-solaris-amd64-debug
Changed to dynamic linking of libgcc.

The -static-libgcc was a legacy of the original build scripts. -R
(analogous to -L link time search path) is a Solaris mechanism to
ensure a needed lib directory is searched at runtime.

In Solaris 10, gcc comes bundled, under /usr/sfw, allowing to use it without
creating dependency problems. This allows eg. benefiting from ordinary 
system
patch maintenance.
=== modified file 'BUILD/compile-solaris-amd64'
--- a/BUILD/compile-solaris-amd64   2009-05-09 04:01:53 +
+++ b/BUILD/compile-solaris-amd64   2009-07-07 11:19:24 +
@@ -26,7 +26,7 @@ path=`dirname $0`
 extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64"
 extra_configs="$amd64_configs $max_configs --with-libevent"
 
-LDFLAGS="-lmtmalloc -static-libgcc"
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64"
 export LDFLAGS
 
 . "$path/FINISH.sh"

=== modified file 'BUILD/compile-solaris-amd64-debug'
--- a/BUILD/compile-solaris-amd64-debug 2009-05-09 04:01:53 +
+++ b/BUILD/compile-solaris-amd64-debug 2009-07-07 11:19:24 +
@@ -5,7 +5,7 @@ path=`dirname $0`
 extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64 $debug_cflags"
 extra_configs="$amd64_configs $debug_configs $max_configs --with-libevent"
 
-LDFLAGS="-lmtmalloc -static-libgcc"
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64"
 export LDFLAGS
 
 . "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-amd64-debug-forte'
--- a/BUILD/compile-solaris-amd64-debug-forte   1970-01-01 00:00:00 +
+++ b/BUILD/compile-solaris-amd64-debug-forte   2009-07-07 11:19:24 +
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+# Take only #define options - the others are gcc specific.
+# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
+DEFS=""
+for F in $debug_cflags ; do
+   expr "$F" : "^-D" && DEFS="$DEFS $F"
+done
+debug_cflags="-O0 -g $DEFS"
+
+extra_flags="-m64 -mt -D_FORTEC_ -xlibmopt -fns=no $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+warnings=""
+c_warnings=""
+cxx_warnings=""
+base_cxxflags="-noex"
+
+CC=cc
+CFLAGS="-xstrconst"
+CXX=CC
+LDFLAGS="-lmtmalloc"
+
+. "$path/FINISH.sh"

=== removed file 'BUILD/compile-solaris-amd64-forte-debug'
--- a/BUILD/compile-solaris-amd64-forte-debug   2009-05-09 04:01:53 +
+++ b/BUILD/compile-solaris-amd64-forte-debug   1970-01-01 00:00:00 +
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-# Take only #define options - the others are gcc specific.
-# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
-DEFS=""
-for F in $debug_cflags ; do
-   expr "$F" : "^-D" && DEFS="$DEFS $F"
-done
-debug_cflags="-O0 -g $DEFS"
-
-extra_flags="-m64 -mt -D_FORTEC_ -xlibmopt -fns=no $debug_cflags"
-extra_configs="$max_configs --with-libevent $debug_configs"
-
-warnings=""
-c_warnings=""
-cxx_warnings=""
-base_cxxflags="-noex"
-
-CC=cc
-CFLAGS="-xstrconst"
-CXX=CC
-LDFLAGS="-lmtmalloc"
-
-. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32'
--- a/BUILD/compile-solaris-x86-32  1970-01-01 00:00:00 +
+++ b/BUILD/compile-solaris-x86-32  2009-07-07 11:19:24 +
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="-D__sun -m32"
+extra_configs="$max_configs --with-libevent"
+
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib"
+export LDFLAGS
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32-debug'
--- a/BUILD/compile-solaris-x86-32-debug1970-01-01 00:00:00 +
+++ b/BUILD/compile-solaris-x86-32-debug2009-07-07 11:19:24 +
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="-D__sun -m32 $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+LDFLAGS="-lmtmalloc -R/usr/s

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2716: Solaris 10 build script fixes by Toby Thain.

2009-07-07 Thread noreply


revno: 2716
committer: kniel...@knielsen-hq.org
branch nick: mariadb-solaris10-port-merge
timestamp: Tue 2009-07-07 13:19:24 +0200
message:
  Solaris 10 build script fixes by Toby Thain.
  
  Added build scripts for 32 bit x86 architecture on Solaris.
  Renamed some scripts for consistency.
  Changed to dynamic linking of libgcc.
removed:
  BUILD/compile-solaris-amd64-forte-debug
added:
  BUILD/compile-solaris-amd64-debug-forte
  BUILD/compile-solaris-x86-32
  BUILD/compile-solaris-x86-32-debug
  BUILD/compile-solaris-x86-32-debug-forte
  BUILD/compile-solaris-x86-forte-32
modified:
  BUILD/compile-solaris-amd64
  BUILD/compile-solaris-amd64-debug

=== modified file 'BUILD/compile-solaris-amd64'
--- BUILD/compile-solaris-amd64 2009-05-09 04:01:53 +
+++ BUILD/compile-solaris-amd64 2009-07-07 11:19:24 +
@@ -26,7 +26,7 @@
 extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64"
 extra_configs="$amd64_configs $max_configs --with-libevent"
 
-LDFLAGS="-lmtmalloc -static-libgcc"
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64"
 export LDFLAGS
 
 . "$path/FINISH.sh"

=== modified file 'BUILD/compile-solaris-amd64-debug'
--- BUILD/compile-solaris-amd64-debug   2009-05-09 04:01:53 +
+++ BUILD/compile-solaris-amd64-debug   2009-07-07 11:19:24 +
@@ -5,7 +5,7 @@
 extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64 $debug_cflags"
 extra_configs="$amd64_configs $debug_configs $max_configs --with-libevent"
 
-LDFLAGS="-lmtmalloc -static-libgcc"
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64"
 export LDFLAGS
 
 . "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-amd64-debug-forte'
--- BUILD/compile-solaris-amd64-debug-forte 1970-01-01 00:00:00 +
+++ BUILD/compile-solaris-amd64-debug-forte 2009-07-07 11:19:24 +
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+# Take only #define options - the others are gcc specific.
+# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
+DEFS=""
+for F in $debug_cflags ; do
+   expr "$F" : "^-D" && DEFS="$DEFS $F"
+done
+debug_cflags="-O0 -g $DEFS"
+
+extra_flags="-m64 -mt -D_FORTEC_ -xlibmopt -fns=no $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+warnings=""
+c_warnings=""
+cxx_warnings=""
+base_cxxflags="-noex"
+
+CC=cc
+CFLAGS="-xstrconst"
+CXX=CC
+LDFLAGS="-lmtmalloc"
+
+. "$path/FINISH.sh"

=== removed file 'BUILD/compile-solaris-amd64-forte-debug'
--- BUILD/compile-solaris-amd64-forte-debug 2009-05-09 04:01:53 +
+++ BUILD/compile-solaris-amd64-forte-debug 1970-01-01 00:00:00 +
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-# Take only #define options - the others are gcc specific.
-# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
-DEFS=""
-for F in $debug_cflags ; do
-   expr "$F" : "^-D" && DEFS="$DEFS $F"
-done
-debug_cflags="-O0 -g $DEFS"
-
-extra_flags="-m64 -mt -D_FORTEC_ -xlibmopt -fns=no $debug_cflags"
-extra_configs="$max_configs --with-libevent $debug_configs"
-
-warnings=""
-c_warnings=""
-cxx_warnings=""
-base_cxxflags="-noex"
-
-CC=cc
-CFLAGS="-xstrconst"
-CXX=CC
-LDFLAGS="-lmtmalloc"
-
-. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32'
--- BUILD/compile-solaris-x86-321970-01-01 00:00:00 +
+++ BUILD/compile-solaris-x86-322009-07-07 11:19:24 +
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="-D__sun -m32"
+extra_configs="$max_configs --with-libevent"
+
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib"
+export LDFLAGS
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32-debug'
--- BUILD/compile-solaris-x86-32-debug  1970-01-01 00:00:00 +
+++ BUILD/compile-solaris-x86-32-debug  2009-07-07 11:19:24 +
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="-D__sun -m32 $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+LDFLAGS="-lmtmalloc -R/usr/sfw/lib"
+export LDFLAGS
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-32-debug-forte'
--- BUILD/compile-solaris-x86-32-debug-forte1970-01-01 00:00:00 +
+++ BUILD/compile-solaris-x86-32-debug-forte2009-07-07 11:19:24 +
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+# Take only #define options - the others are gcc specific.
+# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
+DEFS=""
+for F in $debug_cflags ; do
+expr "$F" : "^-D" && DEFS="$DEFS $F"
+done
+debug_cflags="-O0 -g $DEFS"
+
+extra_flags="-m32 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no 
-xprefetch=auto -xprefetch_level=3 $debug_cflags"
+extra_configs="$max_configs --with-libevent $debug_configs"
+
+warnings=""
+c_warnings=""
+cxx_warnings=""
+base_cxxflags="-noex"
+
+CC=cc
+CFLAGS="-xstrconst"
+CXX=CC
+LDFLAGS="-lmtmalloc"
+
+. "$path/FINISH.sh"

=== added file 'BUILD/compile-solaris-x86-

Re: [Maria-developers] [Merge] lp:~qu1j0t3/maria/solaris10-port into lp:maria

2009-07-07 Thread Kristian Nielsen

Hi Toby,

Toby Thain  writes:

> On 3-Jun-09, at 12:48 PM, Kristian Nielsen wrote:
>
>> Toby Thain  writes:
>>
>>> Toby Thain has proposed merging lp:~qu1j0t3/maria/solaris10-port
>>> into lp:maria.
>>
>>> Added build scripts for 32 bit x86 architecture on Solaris.
>>> Renamed some scripts for consistency. Changed to dynamic linking
>>> of libgcc.
>> I'm basically ok with these changes.
>>
>> However, I would like you to add some explaining comments in the
>> commit
>> message about why the changes are done, especially the above regarding

> The -static-libgcc was a legacy of the original build scripts. -R
> (analogous to -L link time search path) is a Solaris mechanism to
> ensure a needed lib directory is searched at runtime.



I'm sorry that this has been stalling.

I have now re-committed your changes with a more verbose commit message that
includes some of your explanations in the email. I have pushed the result to
lp:maria (no code changes compared to your branch).

Thanks for your efforts with this, and sorry for the delay.

 - Kristian.

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] Bug tracker for MariaDB

2009-07-07 Thread Lenz Grimmer

Hi,

I hope I'm not beating on a dead horse here, I just stumbled over this thread
and wanted to drop my 2 Cents into the hat :)

On 06/24/2009 12:33 AM, Arjen Lentz wrote:

> Ok, but I don't regard those two arguments (Bryan has time for it and  
> others are asking for it) as a convincing argument for having MariaDB  
> use this as a bugtracker. As I mentioned above, the bugtracking system  
> at Launchpad works pretty well, integrated very well with the bzr  
> branches, and so on. Considering MariaDB does interact with other  
> projects for part of its codebase and other purposes, why not use  
> something that already works rather than putting in extra?
> 
> Look Monty, I like Eventum, Open Query uses it for some things also,  
> but that's really not the issue here.
> 
> If Launchpad bug tracking has some issues, we can identify them,  
> report them, and see if they can be addressed.
> We know the people who build it and we know they're active and open to  
> suggestions.
> Just seems like a better way to use time and other resources, with a  
> more satisfactory result for not just MariaDB but also others.
> Wheel-reinventing is terribly distracting and wasteful.

I concur with Arjen here. The integration of the Launchpad Bug tracker with
Bazaar trees and other Launchpad features like the cross-referencing between
other external bug trackers are very compelling. I've been using the Launchpad
bug tracker for keeping a tab on the mylvmbackup bugs and I really like its
functionality. One nice feature for example is the way in which it searches
the database for existing reports when you start with your own bug report.

Also consider the user experience: they would have to learn yet another bug
reporting interface.

Keep it simple and don't reinvent the wheel, just because you can.

I was horrified when I learned that you have chosen to use the ugly and
collaboration-unfriendly WorkLog system again, instead of just utilizing
Lauchpad Blueprints...

Bye,
LenZ
-- 
  Lenz Grimmer  - http://www.lenzg.net/

signature.asc
Description: OpenPGP digital signature
___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] XtraDB merge into MariaDB

2009-07-07 Thread Kristian Nielsen

Vadim Tkachenko  writes:

> I made push to
>
> lp:~maria-captains/maria/mariadb-xtradb6-merge
>
> (not proposed for merge yet).
>
> If everything is fine we can merge it to maria.

I am now looking into this.

I have a hard time understanding this merge. It seems you just applied
manually a patch against latest lp:maria, omitting most (but not all?) of the
necessary fixes I already made in the tree

lp:~maria-captains/maria/mariadb-xtradb-merge2

I think we need to work instead from my merged tree, as that includes the full
bzr history of both lp:maria and lp:percona-xtradb. This is necessary to allow
smooth merging of future changes in XtraDB (and MariaDB).

Basically, the merge should be a simple `bzr merge` from the xtradb6 branch
into my mariadb-xtradb-merge2 branch, and then a merge of that result into
lp:maria. However, I do not know which branch contains the xtradb6 code (is it
pushed to Launchpad yet?). I assumed 'lp:percona-xtradb/release-6', but that
code seems to be missing the changes listed below compared to
mariadb-xtradb-merge.

Can you tell me which branch to merge to get the correct changes?

 - Kristian.

---
diff -u --recursive ./buf/buf0rea.c 
../mariadb-xtradb6-merge/storage/xtradb/buf/buf0rea.c
--- ./buf/buf0rea.c 2009-07-07 14:08:24.0 +0200
+++ ../mariadb-xtradb6-merge/storage/xtradb/buf/buf0rea.c   2009-07-07 
14:02:21.0 +0200
@@ -134,6 +134,46 @@
bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
   tablespace_version, offset);
if (bpage == NULL) {
+   /* bugfix: http://bugs.mysql.com/bug.php?id=43948 */
+   if (recv_recovery_is_on() && *err == DB_TABLESPACE_DELETED) {
+   /* hashed log recs must be treated here */
+   recv_addr_t*recv_addr;
+
+   mutex_enter(&(recv_sys->mutex));
+
+   if (recv_sys->apply_log_recs == FALSE) {
+   mutex_exit(&(recv_sys->mutex));
+   goto not_to_recover;
+   }
+
+   /* recv_get_fil_addr_struct() */
+   recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
+   
hash_calc_hash(ut_fold_ulint_pair(space, offset),
+   recv_sys->addr_hash));
+   while (recv_addr) {
+   if ((recv_addr->space == space)
+   && (recv_addr->page_no == offset)) {
+   break;
+   }
+   recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
+   }
+
+   if ((recv_addr == NULL)
+   || (recv_addr->state == RECV_BEING_PROCESSED)
+   || (recv_addr->state == RECV_PROCESSED)) {
+   mutex_exit(&(recv_sys->mutex));
+   goto not_to_recover;
+   }
+
+   fprintf(stderr, " (cannot find space: %lu)", space);
+   recv_addr->state = RECV_PROCESSED;
+
+   ut_a(recv_sys->n_addrs);
+   recv_sys->n_addrs--;
+
+   mutex_exit(&(recv_sys->mutex));
+   }
+not_to_recover:
 
return(0);
}
@@ -784,11 +824,11 @@
while (buf_pool->n_pend_reads >= recv_n_pool_free_frames / 2) {
 
os_aio_simulated_wake_handler_threads();
-   os_thread_sleep(50);
+   os_thread_sleep(1);
 
count++;
 
-   if (count > 100) {
+   if (count > 5000) {
fprintf(stderr,
"InnoDB: Error: InnoDB has waited for"
" 50 seconds for pending\n"
diff -u --recursive ./handler/innodb_patch_info.h 
../mariadb-xtradb6-merge/storage/xtradb/handler/innodb_patch_info.h
--- ./handler/innodb_patch_info.h   2009-07-07 14:08:24.0 +0200
+++ ../mariadb-xtradb6-merge/storage/xtradb/handler/innodb_patch_info.h 
2009-07-07 14:02:21.0 +0200
@@ -37,5 +37,6 @@
 {"innodb_dict_size_limit","Limit dictionary cache size","Variable 
innodb_dict_size_limit in 
bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
 {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting 
buf_pool_mutex and optimizing based on 
innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
 {"innodb_stats","Additional features about InnoDB 
statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
+{"innodb_recovery_patches","Bugfixes and adjustments a

Re: [Maria-developers] [Merge] lp:~qu1j0t3/maria/solaris10-port into lp:maria

2009-07-07 Thread Toby Thain



On 7-Jul-09, at 7:23 AM, Kristian Nielsen wrote:


Hi Toby,

Toby Thain  writes:


On 3-Jun-09, at 12:48 PM, Kristian Nielsen wrote:


Toby Thain  writes:


Toby Thain has proposed merging lp:~qu1j0t3/maria/solaris10-port
into lp:maria.



Added build scripts for 32 bit x86 architecture on Solaris.
Renamed some scripts for consistency. Changed to dynamic linking
of libgcc.

I'm basically ok with these changes.

However, I would like you to add some explaining comments in the
commit
message about why the changes are done, especially the above  
regarding



The -static-libgcc was a legacy of the original build scripts. -R
(analogous to -L link time search path) is a Solaris mechanism to
ensure a needed lib directory is searched at runtime.




I'm sorry that this has been stalling.

I have now re-committed your changes with a more verbose commit  
message that
includes some of your explanations in the email. I have pushed the  
result to

lp:maria (no code changes compared to your branch).

Thanks for your efforts with this, and sorry for the delay.


Hi Kristian,

Not at all, I believe I was the hold-up, as you asked me to re-commit  
with the explanations in comments. Thanks for taking care of it!


--Toby



 - Kristian.



___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] Bug tracker for MariaDB

2009-07-07 Thread Vadim Tkachenko

Guys,

Let me say my vote here.

I think it is critically important to have bugtracker that can be intergrade
with third-part projects (patches, PBXT, XtraDB).
I am asking to seriously reconsider and use Launchpad project. it may be not
convenient in some ways, but it works.




On Tue, Jul 7, 2009 at 4:53 AM, Lenz Grimmer  wrote:

> Hi,
>
> I hope I'm not beating on a dead horse here, I just stumbled over this
> thread
> and wanted to drop my 2 Cents into the hat :)
>
> On 06/24/2009 12:33 AM, Arjen Lentz wrote:
>
> > Ok, but I don't regard those two arguments (Bryan has time for it and
> > others are asking for it) as a convincing argument for having MariaDB
> > use this as a bugtracker. As I mentioned above, the bugtracking system
> > at Launchpad works pretty well, integrated very well with the bzr
> > branches, and so on. Considering MariaDB does interact with other
> > projects for part of its codebase and other purposes, why not use
> > something that already works rather than putting in extra?
> >
> > Look Monty, I like Eventum, Open Query uses it for some things also,
> > but that's really not the issue here.
> >
> > If Launchpad bug tracking has some issues, we can identify them,
> > report them, and see if they can be addressed.
> > We know the people who build it and we know they're active and open to
> > suggestions.
> > Just seems like a better way to use time and other resources, with a
> > more satisfactory result for not just MariaDB but also others.
> > Wheel-reinventing is terribly distracting and wasteful.
>
> I concur with Arjen here. The integration of the Launchpad Bug tracker with
> Bazaar trees and other Launchpad features like the cross-referencing
> between
> other external bug trackers are very compelling. I've been using the
> Launchpad
> bug tracker for keeping a tab on the mylvmbackup bugs and I really like its
> functionality. One nice feature for example is the way in which it searches
> the database for existing reports when you start with your own bug report.
>
> Also consider the user experience: they would have to learn yet another bug
> reporting interface.
>
> Keep it simple and don't reinvent the wheel, just because you can.
>
> I was horrified when I learned that you have chosen to use the ugly and
> collaboration-unfriendly WorkLog system again, instead of just utilizing
> Lauchpad Blueprints...
>
> Bye,
>LenZ
> --
>  Lenz Grimmer  - http://www.lenzg.net/
>
>
> ___
> Mailing list: 
> https://launchpad.net/~maria-developers
> Post to : maria-developers@lists.launchpad.net
> Unsubscribe : 
> https://launchpad.net/~maria-developers
> More help   : https://help.launchpad.net/ListHelp
>
>
___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] XtraDB merge into MariaDB

2009-07-07 Thread Vadim Tkachenko

Kristian,

Ok, let's try to figure out how to merge it properly :)

I tried to include all your changes, but seems failed.

Actually all latest changes should be in lp:xtradb.

Will it work for simple merge ?

Thanks,
Vadim


Kristian Nielsen wrote:
> Vadim Tkachenko  writes:
> 
>> I made push to
>>
>> lp:~maria-captains/maria/mariadb-xtradb6-merge
>>
>> (not proposed for merge yet).
>>
>> If everything is fine we can merge it to maria.
> 
> I am now looking into this.
> 
> I have a hard time understanding this merge. It seems you just applied
> manually a patch against latest lp:maria, omitting most (but not all?) of the
> necessary fixes I already made in the tree
> 
> lp:~maria-captains/maria/mariadb-xtradb-merge2
> 
> I think we need to work instead from my merged tree, as that includes the full
> bzr history of both lp:maria and lp:percona-xtradb. This is necessary to allow
> smooth merging of future changes in XtraDB (and MariaDB).
> 
> Basically, the merge should be a simple `bzr merge` from the xtradb6 branch
> into my mariadb-xtradb-merge2 branch, and then a merge of that result into
> lp:maria. However, I do not know which branch contains the xtradb6 code (is it
> pushed to Launchpad yet?). I assumed 'lp:percona-xtradb/release-6', but that
> code seems to be missing the changes listed below compared to
> mariadb-xtradb-merge.
> 
> Can you tell me which branch to merge to get the correct changes?
> 
>  - Kristian.
> 


-- 
Vadim Tkachenko, CTO
Percona Inc.
ICQ: 369-510-335, Skype: vadimtk153, Phone +1-888-401-3403
MySQL Performance Blog - http://www.mysqlperformanceblog.com
MySQL Consulting http://www.percona.com/

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] XtraDB merge into MariaDB

2009-07-07 Thread Kristian Nielsen

Vadim Tkachenko  writes:

> Ok, let's try to figure out how to merge it properly :)
>
> I tried to include all your changes, but seems failed.
>
> Actually all latest changes should be in lp:xtradb.

Hm, we must have been misunderstanding each other?

lp:~maria-captains/maria/mariadb-xtradb6-merge is missing all of the changes
outside of storage/xtradb (except one CMakeLists.txt). These missing changes
should not go in stand-alone xtradb, but are needed in MariaDB.

lp:xtradb does not exist. lp:percona-xtradb/release-6  exists, but seems to be
missing some things that are in lp:~maria-captains/maria/mariadb-xtradb-merge2,
including things like #define PERCONA_INNODB_VERSION 6,
/* bugfix: http://bugs.mysql.com/bug.php?id=43948 */, ...

So I am confused about what needs to be merged ...

What I need from you is the name of the branch that contains the stand-alone
XtraDB 6 release. That is the crucial thing.

 - Kristian.

> Kristian Nielsen wrote:
>> Vadim Tkachenko  writes:
>> 
>>> I made push to
>>>
>>> lp:~maria-captains/maria/mariadb-xtradb6-merge
>>>
>>> (not proposed for merge yet).
>>>
>>> If everything is fine we can merge it to maria.
>> 
>> I am now looking into this.
>> 
>> I have a hard time understanding this merge. It seems you just applied
>> manually a patch against latest lp:maria, omitting most (but not all?) of the
>> necessary fixes I already made in the tree
>> 
>> lp:~maria-captains/maria/mariadb-xtradb-merge2
>> 
>> I think we need to work instead from my merged tree, as that includes the 
>> full
>> bzr history of both lp:maria and lp:percona-xtradb. This is necessary to 
>> allow
>> smooth merging of future changes in XtraDB (and MariaDB).
>> 
>> Basically, the merge should be a simple `bzr merge` from the xtradb6 branch
>> into my mariadb-xtradb-merge2 branch, and then a merge of that result into
>> lp:maria. However, I do not know which branch contains the xtradb6 code (is 
>> it
>> pushed to Launchpad yet?). I assumed 'lp:percona-xtradb/release-6', but that
>> code seems to be missing the changes listed below compared to
>> mariadb-xtradb-merge.
>> 
>> Can you tell me which branch to merge to get the correct changes?
>> 
>>  - Kristian.
>> 
>
>
> -- 
> Vadim Tkachenko, CTO
> Percona Inc.
> ICQ: 369-510-335, Skype: vadimtk153, Phone +1-888-401-3403
> MySQL Performance Blog - http://www.mysqlperformanceblog.com
> MySQL Consulting http://www.percona.com/

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] XtraDB merge into MariaDB

2009-07-07 Thread Kristian Nielsen

Kristian Nielsen  writes:

> Vadim Tkachenko  writes:
>
>> Ok, let's try to figure out how to merge it properly :)
>>
>> I tried to include all your changes, but seems failed.
>>
>> Actually all latest changes should be in lp:xtradb.
>
> Hm, we must have been misunderstanding each other?
>
> lp:~maria-captains/maria/mariadb-xtradb6-merge is missing all of the changes
> outside of storage/xtradb (except one CMakeLists.txt). These missing changes
> should not go in stand-alone xtradb, but are needed in MariaDB.
>
> lp:xtradb does not exist. lp:percona-xtradb/release-6  exists, but seems to be
> missing some things that are in 
> lp:~maria-captains/maria/mariadb-xtradb-merge2,
> including things like #define PERCONA_INNODB_VERSION 6,
> /* bugfix: http://bugs.mysql.com/bug.php?id=43948 */, ...
>
> So I am confused about what needs to be merged ...
>
> What I need from you is the name of the branch that contains the stand-alone
> XtraDB 6 release. That is the crucial thing.

And to clarify further, once we have that branch (say "lp:XXX"), here is the
exact procedure that will be needed to do the merge:

bzr branch lp:~maria-captains/maria/mariadb-xtradb-merge2 mybranch
cd mybranch
bzr merge lp:XXX
# Resolve any conflicts...
# Compile + run tests, and fix any errors...
bzr commit -m "Merge XtraDB 6 into MariaDB."
bzr push lp:~maria-captains/maria/mariadb-xtradb-merge2

So as you see, I just need to know what to replace for "XXX".

After that, it would be good if you could look at the test failure in
main.innodb_xtradb_bug317074 seen in our buildbot here:

https://askmonty.org/buildbot/builders/hardy-amd64-dbg/builds/69/steps/test/logs/stdio

But let's get the merge confusion solved first :)

 - Kristian.

___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2716)

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2716: Solaris 10 build script fixes by Toby Thain.

Re: [Maria-developers] [Merge] lp:~qu1j0t3/maria/solaris10-port into lp:maria

Re: [Maria-developers] Bug tracker for MariaDB

Re: [Maria-developers] XtraDB merge into MariaDB

Re: [Maria-developers] [Merge] lp:~qu1j0t3/maria/solaris10-port into lp:maria

Re: [Maria-developers] Bug tracker for MariaDB

Re: [Maria-developers] XtraDB merge into MariaDB

Re: [Maria-developers] XtraDB merge into MariaDB

Re: [Maria-developers] XtraDB merge into MariaDB

10 matches

Site Navigation

Mail list logo

Footer information