into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

the result should be added by 1 by the year(now()) function.


mysql-test/r/view.result:
  SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75; 
  the above statement in test file has a year(now()) function, 
  the result should increase by 1 from 2007 year to 2008 year.

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug29851


sql/ha_ndbcluster.cc:
  Auto merged

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug30271

ndb/include/kernel/ndb_limits.h:
  1) define a macro MAX_DATA_NODE_ID to set the max ID of data nodes to be MAX_NDB_NODES - 1
  2) define a macro MAX_NODES_ID to set the max ID of API and MGM to be MAX_NODES -1
ndb/src/mgmsrv/ConfigInfo.cpp:
  1) replace MAX_NODES with MAX_DATA_NODE_ID (= MAX_NDB_NODES - 1)  when the NodeId represents data nodes.
  2) replace MAX_NODES with MAX_NODES_ID (= MAX_NODES -1) when the NodeId represents API or MGM nodes.

mysql-test/r/ndb_alter_table2.result:
  Add test case for BUG#29851
mysql-test/t/ndb_alter_table2.test:
  Add test case for BUG#29851
sql/ha_ndbcluster.cc:
  Indexes are dropped also when dropping table in GlobalDictCache

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj

ndb/src/ndbapi/NdbBlob.cpp:
  race condition : s/committedRead/readTuple/ when reading parts since TUP commits tuples separately

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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Remove warning in pushbuild

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

mysql-test/Makefile.am:
  Add install info of new test case data in makefile.am

ndb/include/mgmapi/ndb_logevent.h:
  Add page_size_bytes member variable for MemoryUsage. And don't remove page_size_kb member variable at present for the compatibility backward.
ndb/src/mgmapi/ndb_logevent.cpp:
  change the page_size_kb member variable of MemoryUsage to page_size_bytes

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


sql/ha_ndbcluster.cc:
  Auto merged

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-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


mysql-test/r/ndb_bug26793.result:
    mysql-test/r/ndb_bug26793.result@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none)
  +1 -6
      Update test result
mysql-test/t/ndb_bug26793.test:
    mysql-test/t/ndb_bug26793.test@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +8
  -11
      - Remove the drop/restore of anonymous users - there are no such users
      by default anymore(if there were, they would probably be in mysql.user)
      - Switch back to default connection before cleanup 
      - Drop user1@localhost as part of cleanup

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

  Handle out of transaction buffer in TC for INDX lookups


ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error codes for simulating out of transaction buffer memory
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Change signature to handle out of buffer
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle otu of transaction buffers in index operations
    (TCINDXREQ++)
ndb/src/ndbapi/NdbTransaction.cpp:
  Give more info on 4012
ndb/src/ndbapi/ndberror.c:
  Add new error code
ndb/test/ndbapi/testIndex.cpp:
  add tests
ndb/test/run-test/daily-basic-tests.txt:
  add tests
sql/ha_ndbcluster.cc:
  Set correct status

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


sql/ha_ndbcluster.cc:
  Auto merged

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

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Twiddle the "replicaCount" and "fragCount" variable when restore data from different endian.
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add byte order variable
ndb/tools/restore/Restore.cpp:
  Twiddle blob, datatime,timestamp when do restore in different endian.
mysql-test/r/ndb_restore_different_endian_data.result:
  Test case result for restore data from different endian
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl:
  Test case data
mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log:
  Test case data
mysql-test/t/ndb_restore_different_endian_data.test:
  Test case for restore data from different endian

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


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

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

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

ndb/tools/restore/restore_main.cpp:
  modify --print explaination of ndb_restore

sql/ha_ndbcluster.cc:
  make HA_ERR_FOUND_DUPP_KEY error cases throw warning like the other ambiguous engine error codes that may be caused by multiple cluster error codes

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  dont assert if 2 LCP's are being run during a node recovery

into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Not very clever fix for DIH incorrect REDO handling
    - Dont report GCP_SAVE_CONF until first LCP has been complete during NR

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


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

  In TC init node status for already started nodes during node restart
  (not present in 5.1)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  on node restart, make sure to init all already started nodes to NF_STARTED
ndb/test/ndbapi/testNodeRestart.cpp:
  test prg
ndb/test/run-test/daily-basic-tests.txt:
  test prg

  Fix 3 problems in REDO validation that could(will) lead to "Error while reading REDO log"


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  add new state
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix bugs + add debugging