Commit 2ef66fca authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1 

into mysql.com:/home/psergey/mysql-5.1-bug19684


sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 027d90bc 0ad73944

.bzrignore

+4 −3
Original line number Diff line number Diff line 
*-t

*.a

*.bb

*.bbg
@@ -458,6 +459,7 @@ libmysqld/emb_qcache.cpp 
libmysqld/errmsg.c

libmysqld/event.cc

libmysqld/event_executor.cc

libmysqld/event_scheduler.cc

libmysqld/event_timed.cc

libmysqld/examples/client_test.c

libmysqld/examples/client_test.cc
@@ -788,6 +790,8 @@ mysys/main.cc 
mysys/my_new.cpp

mysys/raid.cpp

mysys/ste5KbMa

mysys/test_atomic

mysys/test_bitmap

mysys/test_charset

mysys/test_dir

mysys/test_gethwaddr
@@ -1770,6 +1774,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
libmysqld/event_scheduler.cc

mysys/test_atomic

*-t

BUILD/compile-pentium64

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_cflags $fast_cflags"

c_warnings="$c_warnings"

cxx_warnings="$cxx_warnings"

extra_configs="$pentium_configs $static_link"



extra_configs="$extra_configs "

CC="$CC --pipe"

. "$path/FINISH.sh"

BUILD/compile-pentium64-debug

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ extra_flags="$pentium64_cflags $debug_cflags" 
extra_configs="$pentium_configs $debug_configs $static_link"



extra_configs="$extra_configs "



CC="$CC --pipe"

. "$path/FINISH.sh"

BUILD/compile-pentium64-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ extra_flags="$pentium64_cflags $debug_cflags" 
extra_configs="$pentium_configs $debug_configs $max_configs"



extra_configs="$extra_configs "



CC="$CC --pipe"

. "$path/FINISH.sh"

BitKeeper/triggers/pre-outgoing.crash-protect.pl

0 → 100755
+85 −0
Original line number Diff line number Diff line 
#! /usr/bin/perl



use strict;

use warnings;



my $event= $ENV{BK_EVENT};

unless($event eq 'outgoing pull' || $event eq 'outgoing push' ||

       $event eq 'resolve') {

  exit 0;

}



print "Checking for bad changesets from old crashed 5.1 tree...\n";



my @bad_csets=

    ( 'monty@mysql.com|ChangeSet|20060418090255|16983',

      'monty@mysql.com|ChangeSet|20060418090458|02628',

      'monty@mysql.com|ChangeSet|20060419084236|49576',

      'monty@mysql.com|ChangeSet|20060503164655|51444',

      'monty@mysql.com|ChangeSet|20060503225814|60133',

      'monty@mysql.com|ChangeSet|20060504033006|54878',

      'monty@mysql.com|ChangeSet|20060504130520|48660',

      'monty@mysql.com|ChangeSet|20060504164102|03511',

      'monty@mysql.com|ChangeSet|20060504193112|04109',

      'monty@mysql.com|ChangeSet|20060505015314|02799',

      'monty@mysql.com|ChangeSet|20060505084007|16704',

      'monty@mysql.com|ChangeSet|20060505104008|16695',

      'monty@mysql.com|ChangeSet|20060505171041|13924',

      'monty@mysql.com|ChangeSet|20060508121933|13866',

      'monty@mysql.com|ChangeSet|20060508160902|15029',

      'monty@mysql.com|ChangeSet|20060509145448|38636',

      'monty@mysql.com|ChangeSet|20060509224111|40037',

      'monty@mysql.com|ChangeSet|20060510090758|40678',

      'monty@mysql.com|ChangeSet|20060515164104|46760',

      'monty@mysql.com|ChangeSet|20060530114549|35852',

      'monty@mysql.com|ChangeSet|20060605032828|23579',

      'monty@mysql.com|ChangeSet|20060605033011|10641',

      'monty@mysql.com|ChangeSet|20060605060652|09843',

      'msvensson@neptunus.(none)|ChangeSet|20060605094744|10838',

      'msvensson@neptunus.(none)|ChangeSet|20060605105746|11800',

      'msvensson@neptunus.(none)|ChangeSet|20060605122345|12772',

      'jmiller@mysql.com|ChangeSet|20060531210831|36442',

      'jmiller@mysql.com|ChangeSet|20060602151941|36118',

      'jmiller@mysql.com|ChangeSet|20060602152136|27762',

      'jmiller@mysql.com|ChangeSet|20060605121748|12864',

      'jmiller@mysql.com|ChangeSet|20060605160304|14798',

      'jimw@mysql.com|ChangeSet|20060605210201|14667',

      'igor@rurik.mysql.com|ChangeSet|20060605220727|15265',

      'igor@rurik.mysql.com|ChangeSet|20060605221206|15134',

      'stewart@mysql.com|ChangeSet|20060525073521|11169',

      'stewart@mysql.com|ChangeSet|20060605154220|12975',

      'stewart@mysql.com|ChangeSet|20060606040001|15337',

      );



# Read the list of changesets.

my $csetlist = $ENV{BK_CSETLIST};

if(!defined($csetlist) || !open(FH, '<', $csetlist)) {

  die "Failed to open list of incoming changesets '$csetlist': $!.\n";

}

my @csets = <FH>;

close FH;



# Reject any attempt to push/pull a bad changeset.

for my $cs (@csets) {

  # Do this the raw way, don't want to be bitten by different EOL conventions

  # on server and client (Unix/Windows/Mac).

  $cs =~ s/\x0d?\x0a?$//s;

  if(grep($_ eq $cs, @bad_csets)) {

    print <<END;

BAD CHANGESET DETECTED! $event REJECTED!



The changeset with key '$cs' was detected in the attempted push or pull.

This changeset is from the corrupt part of the crashed mysql-5.1-new tree.

Pushing or pulling this changeset would result in corruption of the new tree,

and therefore the operation has been rejected.



Contact Kristian Nielsen (knielsen\@mysql.com, IRC knielsen) if you have any

questions regarding this.

END

    exit 1;

  }

}



print "No bad changesets found, proceeding.\n";



exit 0;