Commits · 4352ec45d7a5811dab9b5e95b1fb842cb1f9292b · Kirill Smelkov / mariadb

27 Jul, 2007 9 commits

WL#3915 : (NDB) master's cols > slave · 4352ec45
unknown authored Jul 27, 2007
```
Minor change to fix compile problems on 64-bit.
```
4352ec45
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3228_ndb · dcdc40b6
unknown authored Jul 27, 2007
```
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-ndb-push


mysql-test/t/disabled.def:
  SCCS merged
```
dcdc40b6

Merge mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3228_ndb · e1c7a80e

unknown authored Jul 27, 2007

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


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/r/rpl_rbr_to_sbr.result:
  Auto merged
mysql-test/r/rpl_row_basic_11bugs.result:
  Auto merged
mysql-test/r/rpl_row_create_table.result:
  Auto merged
mysql-test/r/rpl_row_flsh_tbls.result:
  Auto merged
mysql-test/r/rpl_row_inexist_tbl.result:
  Auto merged
mysql-test/r/rpl_row_log.result:
  Auto merged
mysql-test/r/rpl_row_log_innodb.result:
  Auto merged
mysql-test/r/rpl_row_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_row_until.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
mysql-test/r/rpl_truncate_7ndb.result:
  Auto merged
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
mysql-test/t/rpl_row_flsh_tbls.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/rpl_utility.h:
  Auto merged
BitKeeper/deleted/.del-rpl_colSize.result:
  Delete: mysql-test/r/rpl_colSize.result
BitKeeper/deleted/.del-rpl_colSize.test:
  Delete: mysql-test/t/rpl_colSize.test
mysql-test/r/rpl_ndb_log.result:
  pull merge
  ,
sql/rpl_utility.cc:
   pull merge

e1c7a80e

WL#3915 : (NDB) master's cols > slave · 4375508a

unknown authored Jul 27, 2007

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.

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
WL#3915 master's cols > slave

Changed test to remove checks for error#1523 (more master cols than
slave). This portion of the test is no longer needed.
mysql-test/r/rpl_row_tabledefs_2myisam.result:
WL#3915 master's cols > slave

Corrected results from removal of checks for error#1523 (more master
cols than slave). This portion of the test is no longer needed.
mysql-test/r/rpl_row_tabledefs_3innodb.result:
WL#3915 master's cols > slave

Corrected results from removal of checks for error#1523 (more master
cols than slave). This portion of the test is no longer needed.
mysql-test/t/disabled.def:
WL#3915 master's cols > slave

Disabled the rpl_stm_extraColmaster_ndb test because statement-based
replication is not supported in NDB at this time. It can be enabled
when statement-based replication for NDB is released.
sql/log_event.cc:
WL#3915 master's cols > slave

copying extra (slave's) fields returns early if master's table version is wider;
removing assert in the way of master > slave cols.
sql/rpl_record.cc:
WL#3915 master's cols > slave

adding a snippet that shift exectution curson donw the row skipping unknown by slave
fields' data.
sql/rpl_utility.cc:
WL#3915 master's cols > slave

Remove warning message for master's cols > slave.
mysql-test/t/rpl_extraColmaster_innodb-master.opt:
WL#3915 master's cols > slave

option for innodb
mysql-test/t/rpl_extraColmaster_innodb-slave.opt:
WL#3915 master's cols > slave

option for innodb
mysql-test/t/rpl_extraColmaster_innodb.test:
WL#3915 master's cols > slave

Test of innodb. Test runs in both statement- and row-based replication.
mysql-test/t/rpl_extraColmaster_myisam.test:
WL#3915 master's cols > slave

Test of myisam. Test runs in both statement- and row-based replication.
mysql-test/t/rpl_row_extraColmaster_ndb.test:
WL#3915 master's cols > slave

Test of ndb. Test runs in row-based replication.
mysql-test/r/rpl_extraColmaster_innodb.result:
WL#3915 master's cols > slave

new results
mysql-test/t/rpl_stm_extraColmaster_ndb.test:
WL#3915 master's cols > slave

Test of ndb. Test runs in statement-based replication.
mysql-test/r/rpl_extraColmaster_myisam.result:
WL#3915 master's cols > slave

new results
mysql-test/r/rpl_row_extraColmaster_ndb.result:
WL#3915 master's cols > slave

new results
mysql-test/r/rpl_stm_extraColmaster_ndb.result:
WL#3915 master's cols > slave

new results
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
WL#3915 master's cols > slave

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

4375508a

WL#3228 (NDB) : RBR using different table defs on slave/master · ef79d224

unknown authored Jul 27, 2007

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.


mysql-test/extra/rpl_tests/rpl_log.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to display slave status vertically.
mysql-test/r/rpl_ndb_log.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_rbr_to_sbr.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_basic_11bugs.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_create_table.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_flsh_tbls.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_inexist_tbl.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_log.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_log_innodb.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_max_relay_size.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_until.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_stm_log.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the rpl_log.test modifications.
mysql-test/r/rpl_truncate_7ndb.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to coincide with changes to binlog
  size of table map event.
mysql-test/t/rpl_row_create_table.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to coincide with changes to binlog
  size of table map event.
mysql-test/t/rpl_row_flsh_tbls.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to coincide with changes to binlog
  size of table map event.
sql/field.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch includes updates to the unpack() methods for the variable
  length fields. A new parameter was added (from_length) that is the
  value stored in the field_metadata of the table map from the table_def
  class. If the value is non-zero and less than what the field on the 
  slave is then use the from_length else use the original value from the
  field on the slave.
sql/field.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch includes updates to the unpack() methods for the variable
  length fields. A new parameter was added (from_length) that is the
  value stored in the field_metadata of the table map from the table_def
  class.
sql/log_event.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds methods to calculate the field metadata size, prepare
  the field metadata for writing to the binlog, and additions to the
  Table_map_log_event::write_body method to include the field metadata 
  in the table map that is written to the binlog.
sql/log_event.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds method declarations and variables needed to support
  storing field metadata in the table map that is written to the binlog.
sql/rpl_record.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch modifies the unpack_row() method to unpack fields passing in
  the value from the table_def class. This value is the extra field
  metadata stored there from the master.
sql/rpl_rli.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds a helper function to retrieve the table_def for a given
  table in the RPL_TABLE_LIST structure.
sql/rpl_utility.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds a helper method that retrieves the correct size 
  parameter for the field. This method is used to compare the size as
  sent by the master with that on the slave for all types of fields that
  can vary in size and storage requirements.
sql/rpl_utility.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the table_def class constructor to pass in the raw
  data read from the table map and extract it into an array of dimension
  size (number of fields). It also adds a method to return the field 
  metadata for any field. The method returns the data stored in the table
  map or 0 if no data was stored for that field. Lastly, a method to return
  the results of field->maybe_null() is included so that the slave can
  determine if a field that is not on the slave is null.
mysql-test/t/rpl_colSize.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a new test designed to test the feature of having
  columns on the master that are smaller than what is on the slave.
mysql-test/r/rpl_colSize.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.

ef79d224

WL#3228 (NDB) : RBR using different table defs on slave/master · 0e0b05ec

unknown authored Jul 27, 2007

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.


mysql-test/extra/rpl_tests/rpl_log.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to display slave status vertically.
mysql-test/r/rpl_ndb_log.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_rbr_to_sbr.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_basic_11bugs.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_create_table.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_flsh_tbls.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_inexist_tbl.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_log.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_log_innodb.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_max_relay_size.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_row_until.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/r/rpl_stm_log.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the rpl_log.test modifications.
mysql-test/r/rpl_truncate_7ndb.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to coincide with changes to binlog
  size of table map event.
mysql-test/t/rpl_row_create_table.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to coincide with changes to binlog
  size of table map event.
mysql-test/t/rpl_row_flsh_tbls.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the test to coincide with changes to binlog
  size of table map event.
sql/field.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch includes updates to the unpack() methods for the variable
  length fields. A new parameter was added (from_length) that is the
  value stored in the field_metadata of the table map from the table_def
  class. If the value is non-zero and less than what the field on the 
  slave is then use the from_length else use the original value from the
  field on the slave.
sql/field.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch includes updates to the unpack() methods for the variable
  length fields. A new parameter was added (from_length) that is the
  value stored in the field_metadata of the table map from the table_def
  class.
sql/log_event.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds methods to calculate the field metadata size, prepare
  the field metadata for writing to the binlog, and additions to the
  Table_map_log_event::write_body method to include the field metadata 
  in the table map that is written to the binlog.
sql/log_event.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds method declarations and variables needed to support
  storing field metadata in the table map that is written to the binlog.
sql/rpl_record.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch modifies the unpack_row() method to unpack fields passing in
  the value from the table_def class. This value is the extra field
  metadata stored there from the master.
sql/rpl_rli.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds a helper function to retrieve the table_def for a given
  table in the RPL_TABLE_LIST structure.
sql/rpl_utility.cc:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch adds a helper method that retrieves the correct size 
  parameter for the field. This method is used to compare the size as
  sent by the master with that on the slave for all types of fields that
  can vary in size and storage requirements.
sql/rpl_utility.h:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch changes the table_def class constructor to pass in the raw
  data read from the table map and extract it into an array of dimension
  size (number of fields). It also adds a method to return the field 
  metadata for any field. The method returns the data stored in the table
  map or 0 if no data was stored for that field. Lastly, a method to return
  the results of field->maybe_null() is included so that the slave can
  determine if a field that is not on the slave is null.
mysql-test/r/rpl_colSize.result:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a result file for the new test designed to test the 
  feature of having columns on the master that are smaller than what is 
  on the slave.
mysql-test/t/rpl_colSize.test:
  WL#3228 : RBR using different table defs on slave/master
  
  This patch contains a new test designed to test the feature of having
  columns on the master that are smaller than what is on the slave.

0e0b05ec

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work · 1004dc60
unknown authored Jul 27, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
```
1004dc60
save the data from mysql.db that we delete (side effect that made read_only fail) · 180068dd
unknown authored Jul 27, 2007

180068dd
point to bugs needing to be addressed before rpl_ndb_ctype_ucs2_def can be enabled · 32d29bbe
unknown authored Jul 27, 2007

32d29bbe

26 Jul, 2007 3 commits

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge · 58bfa0f8
unknown authored Jul 26, 2007
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
```
58bfa0f8

[PATCH] Bug#26793 I_S query crashes in NDB · ffa5fb61

unknown authored Jul 26, 2007

If ::exteral_lock hadn't been called, we'd have no NDB object,
so need to check/get one here.

It looks like sql_show.cc is the only place that does this....
or at least the other places will be well hidden.

Index: ndb-work/sql/ha_ndbcluster.cc
===================================================================


sql/ha_ndbcluster.cc:
  Bug#26793 I_S query crashes in NDB

ffa5fb61

[PATCH] BUG#26793 test: mysqld crashes in NDB on I_S query · b50015f2

unknown authored Jul 26, 2007

Reduce case and formalise into something we should be
able to use in mysql-test-run.

Index: ndb-work/mysql-test/t/ndb_bug26793.test
===================================================================


mysql-test/r/ndb_bug26793.result:
  BUG#26793 test: mysqld crashes in NDB on I_S query
mysql-test/t/ndb_bug26793.test:
  BUG#26793 test: mysqld crashes in NDB on I_S query

b50015f2

25 Jul, 2007 2 commits
- BUG#30017 log-slave-updates incorrect behavior for cluster · 7e056fee
  unknown authored Jul 25, 2007
```
- let the receiving injector thread decide what to do
```
  7e056fee
- wait_until_ready may return greater that 1 since wait time for second node to connect is 0 · 253a8df2
  unknown authored Jul 25, 2007
  
  253a8df2
13 Jul, 2007 6 commits
- avoid multiple defines of server1/2 · d8effbe3
  unknown authored Jul 13, 2007
  
  d8effbe3
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 497b7a57
  unknown authored Jul 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged
```
  497b7a57
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · 0255c9a7
  unknown authored Jul 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
```
  0255c9a7
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj · 55245408
  unknown authored Jul 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  55245408
- Bug #29762 The ndbapi-examples don't work as expected due to api changes in MySQL 5.1.16] · 701dfda1
  unknown authored Jul 13, 2007
  
  701dfda1
- avoid some sporadic startup issues · fe6d5d63
  unknown authored Jul 13, 2007
  
  fe6d5d63
11 Jul, 2007 1 commit
- fix ndb_version.h so that it is usable and make some functions public to handle ndb version · 49bb7e20
  unknown authored Jul 11, 2007
  
  49bb7e20
09 Jul, 2007 2 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · cd6f2f6b

unknown authored Jul 09, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  manual merge

cd6f2f6b

Bug #29570 · ba6c552b
unknown authored Jul 09, 2007
```
- correct result files
```
ba6c552b

06 Jul, 2007 2 commits
- Bug #29570 original error lost in write_event on slave · 4e825803
  unknown authored Jul 06, 2007
```
- make sure error gets propagated to thd->net by calling print_error
- also print the full error message
```
  4e825803
- update some description in t/disable.def for testcase rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb · ae23a601
  unknown authored Jul 06, 2007
```
mysql-test/t/disabled.def:
  correct related bug, bug#29549 discovers more accurate reason
```
  ae23a601
04 Jul, 2007 8 commits
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 8a976f5a
  unknown authored Jul 04, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  8a976f5a
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 87675bcd
  unknown authored Jul 04, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
```
  87675bcd
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 2088eae2
  unknown authored Jul 04, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
```
  2088eae2
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a3cd95ee
  unknown authored Jul 04, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
```
  a3cd95ee
- ndb - bug#29354 - fix bug in bug fix, · 7ebebf5e
  unknown authored Jul 04, 2007
```
  dont assert if 2 LCP's are being run during a node recovery
```
  7ebebf5e
- backport compute hash · 1b841216
  unknown authored Jul 04, 2007
  
  1b841216
- Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj · 2d1d0efc
  unknown authored Jul 04, 2007
```
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941
```
  2d1d0efc
- Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941 · ae417134
  unknown authored Jul 04, 2007
```
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug25941


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Print warning message to stderr instead of stdout
```
  ae417134
03 Jul, 2007 7 commits

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · aa1d69a8
unknown authored Jul 03, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
aa1d69a8
ndb - bug#28720 · 5b14bc33
unknown authored Jul 03, 2007
```
  fix also undo files
```
5b14bc33
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · b6ea4c8c
unknown authored Jul 03, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
b6ea4c8c
ndb - bug#28720 - "Disk data meta information is not visible in mysqld but exists in ndbd" · a3715c97
unknown authored Jul 03, 2007
```
  continue on unknown result (no contact)


sql/ha_ndbcluster.cc:
  continue on unknown result (no contact)
```
a3715c97

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 0ec2c73d

unknown authored Jul 03, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged

0ec2c73d

ndb - bug#28642 - Tablespace returning incorrect usage status · ac84ebf6

unknown authored Jul 03, 2007

make free 64 bit (as it represents free bytes, not free extents as originally designed)

storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
make free 64 bit (as it represents free bytes, not free extents as originally designed)

ac84ebf6

ndb - bug#25901 · e6781590

unknown authored Jul 03, 2007

  handle undofile/logfile groups that were created while node was node


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure that START_RECREQ is run on lgman/tsman even during initial node restart
storage/ndb/src/kernel/blocks/lgman.cpp:
  Set state to LG_STARTING during node/system restart
storage/ndb/src/kernel/blocks/lgman.hpp:
  add new state

e6781590