Commit 00d96458 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/sql_class.h:
  Fixed indentation
parents 163c2a60 450bf11a

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -567,8 +567,10 @@ heap/hp_test2 
help

help.c

help.h

include/check_abi

include/my_config.h

include/my_global.h

include/mysql_h.ic

include/mysql_version.h

include/mysqld_ername.h

include/mysqld_error.h
@@ -1260,6 +1262,7 @@ mysql-test/r/bdb-deadlock.err 
mysql-test/r/bdb.err

mysql-test/r/bdb.log

mysql-test/r/bdb_cache.err

mysql-test/r/blackhole.log

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ else 
  cxx_warnings="$warnings -std=c++98"

# NOTE: warning mode should not influence optimize/debug mode.

# Please feel free to add a separate option if you don't feel it's an overkill.

  debug_extra_flags="-O0"

  debug_extra_cflags="-O0"

# Reset CPU flags (-mtune), they don't work in -pedantic mode

  check_cpu_cflags=""

fi

BitKeeper/etc/collapsed

+10 −0
Original line number Diff line number Diff line
@@ -5,5 +5,15 @@ 
45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

45143312u0Tz4r0wPXCbUKwdHa2jWA

45143b90ewOQuTW8-jrB3ZSAQvMRJw

45184588w9U72A6KX1hUFeAC4shSHA

45185df8mZbxfp85FbA0VxUXkmDewA

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

451b110a3ZV6MITl93ehXk2wxrbW7g

45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454f8960jsVT_kMKJtZ9OCgXoba0xQ

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

+0 −4
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || 
  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',
@@ -80,6 +78,4 @@ END 
  }

}



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



exit 0;

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

+0 −4
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ unless($event eq 'outgoing pull' || $event eq 'outgoing push' || 
  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',
@@ -80,6 +78,4 @@ END 
  }

}



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



exit 0;