into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29674

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29674

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30134

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29674

Index: ndb-work/storage/ndb/tools/ndb_size.pl
===================================================================

Index: ndb-work/storage/ndb/tools/ndb_size.pl
===================================================================

Patch by: Monty Taylor <mtaylor@mysql.com>
Fixes by: Stewart Smith

  Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
  ---
  Added schema name information to index table calculations as well.
  ---
  Made database an optional parameter, the exclusion of which causes all databases to be examined.
  If selecting from information_schema fails, attempt to fall back to show tables from
  ---
  Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
  ---
  Fixed report title for the case where we are using operating on more than one database.
  ---
  Fixed some perl style concerns timothy had.
  Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
  Get this full list of databases from show databases if needed.

  storage/ndb/tools/ndb_size.pl@stripped, 2007-05-25 13:45:44-07:00, mtaylor@qualinost.(none) +102 -28
    Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
    ---
    Added schema name information to index table calculations as well.
    ---
    Made database an optional parameter, the exclusion of which causes all databases to be examined.
    If selecting from information_schema fails, attempt to fall back to show tables from
    ---
    Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
    ---
    Fixed report title for the case where we are using operating on more than one database.
    ---
    Fixed some perl style concerns timothy had. 
    Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
    Get this full list of databases from show databases if needed.

Index: ndb-work/storage/ndb/tools/ndb_size.pl
===================================================================

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Regenerated result

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

ChangeSet@1.2575, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
  Bug#26793 mysqld crashes when doing specific query on information_schema
   - Drop the newly created user user1@localhost
   - Cleanup testcase

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

bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Disable multi_read_range if there are after delete/update triggers

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug27683

 - Drop the newly created user user1@localhost
 - Cleanup testcase

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354

This patch corrects a incorrect type conversion during encoding and
decoding the length for VARCHAR fields.

  
This patch changes the code to comply with different word order on Solaris

Patch for PB testing errors.

Patch corrects minor test anomolies and build warnings.

Minor change to fix compile problems on 64-bit.

into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-ndb-push

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3915_ndb

Slave starts accepting and handling rows of master's tables which have more columns.
The most important part of implementation is how to caclulate the amount of bytes to
skip for unknown by slave column.

To solve that issue this WL adopts results of WL#3228 which introduces an addon to
table_map event that carries the necessary part of information about sizes of data of columns.

mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@stripped, 2007-07-26 21:31:54-04:00, cbell@mysql_cab_desk. +393 -0
WL#3915  master's cols > slave

basic tests checking altering and skipping extra fields by slave.
The fields can be of any possible types.

This patch adds the ability to store extra field metadata in the table
map event. This data can include pack_length() or field_lenght() for
fields such as CHAR or VARCHAR enabling developers to add code that
can check for compatibilty between master and slave columns. More 
importantly, the extra field metadata can be used to store data from the
master correctly should a VARCHAR field on the master be <= 255 bytes 
while the same field on the slave is > 255 bytes. '

The patch also includes the needed changes to unpack to ensure that data
which is smaller on the master can be unpacked correctly on the slave.

This patch adds the ability to store extra field metadata in the table
map event. This data can include pack_length() or field_lenght() for
fields such as CHAR or VARCHAR enabling developers to add code that
can check for compatibilty between master and slave columns. More 
importantly, the extra field metadata can be used to store data from the
master correctly should a VARCHAR field on the master be <= 255 bytes 
while the same field on the slave is > 255 bytes. '

The patch also includes the needed changes to unpack to ensure that data
which is smaller on the master can be unpacked correctly on the slave.

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge