maria-developers team mailing list archive

[Sergei Petrunia <psergey@xxxxxxxxxxxx>]

I see that this was not fixed yet (I was looking at 10.0-base) . This is a reminder, please fix.

On Thu, Oct 10, 2013 at 06:42:15PM +0400, Sergei Petrunia wrote:
> Hi Sanja,
> 
> My experiment was successfull.  It seems, one can fix identation in sql_join_cache.cc so in the following way:
>  
> # Create a branch in a state "right after the problem"
> bzr branch -rsanja@xxxxxxxxxxxx-20121223213711-ac5vz2fspwapjvtr 10.0 work-maria-10.0-base-cassandra-look1
> 
> # The -r3457 branch shows the state "right before the merge that borked it"
> bzr branch  -r3457 work-maria-10.0-base-cassandra-look1 work-maria-10.0-base-cassandra-look1-r3457
> cd  work-maria-10.0-base-cassandra-look1-r3457
> # Do some dummy change to force a merge
> gvim sql/sql_join_cache.cc 
> bzr gcommit 
> 
> # Prepare the branch where we will fix it
> cd ..
> bzr branch work-maria-10.0-base-cassandra-look1 work-maria-10.0-base-cassandra-look1-cp
> cd work-maria-10.0-base-cassandra-look1-cp
> 
> 
> # This should show that you're going to merge the dummy change
> bzr missing --theirs-only ../work-maria-10.0-base-cassandra-look1-r3457/ 
> 
> #
> # This will will succeed without conflicts. We will use this merge as an
> # excuse to fix the problem
> #
> bzr merge --pull  ../work-maria-10.0-base-cassandra-look1-r3457/
> 
> 
> # 
> # Now, edit the "broken" file and the original file until sql/sql_join_cache.cc
> # is ok 
> #
> gvimdiff ~/home/psergey/dev2/work-maria-10.0-base-cassandra-look1-r3457/sql/sql_join_cache.cc sql/sql_join_cache.cc 
> 
> # Commit 
> bzr gcommit 
> 
> #
> # Merge the change into a recent 10.0-base.
> #
> cd 10.0-base
> bzr merge --pull ../work-maria-10.0-base-cassandra-look1-cp/
> bzr gcommit 
> 
> #
> # Check the history. It MUST NOT show any of today's merges. 
> # the code in  bkah_skip_index_tuple() should show that lines belong to
> #
> # igor@xxxxxxxxxxxx-20100831163421-iiddbral4jr3q75q
> #    The main patch for MWL#128: Implement Block Nested Loop Hash Join.
> # 
> # sanja@xxxxxxxxxxxxxxxx-20120216064910-k0ud8ja7ef1jnpx4
> #    Counters for Index Condition Pushdown added (MDEV-130).
> 
> bzr gannotate  sql/sql_join_cache.cc 
> 
> 
> 
> 
> BR
>  Sergei
> --
> 
> Sergei Petrunia, Software Developer
> MariaDB | Skype: sergefp | Blog: http://s.petrunia.net/blog
> 
> 

-- 
BR
 Sergei
-- 
Sergei Petrunia, Software Developer
MariaDB | Skype: sergefp | Blog: http://s.petrunia.net/blog