Commits · 9be5a3d973cdc4552c9226b22dddcb1dd070d328 · nexedi / MariaDB

05 Jul, 2006 9 commits

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 9be5a3d9

unknown authored Jul 05, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged

9be5a3d9

Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails · 7ec80185
unknown authored Jul 05, 2006
```
- updated error message to more correctly reflect the issue
```
7ec80185
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 3d8a26e7
unknown authored Jul 05, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
```
3d8a26e7
added warning on cluster reconnect and binlog usage, that data may be missing · b5a83757
unknown authored Jul 05, 2006

b5a83757
ndb - ndb api : try to catch autoincr 'error 0' · ad5ee628
unknown authored Jul 05, 2006
```
storage/ndb/src/ndbapi/Ndb.cpp:
  try to catch autoincr 'error 0'
```
ad5ee628
Bug #20843 tests fails randomly with assertion in completeClusterFailed · 1da25e65
unknown authored Jul 05, 2006

1da25e65

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 070632e9

unknown authored Jul 05, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbApi.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndberr.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbif.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbinit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/include/HugoTransactions.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/src/HugoTransactions.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1

070632e9

Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it. · e2a8426f
unknown authored Jul 05, 2006
```
- remove some event code to get rid of some bugs
```
e2a8426f

extra logging and asserts to try to track down the spurious completeCluster failure assetion · 9884e0b6

unknown authored Jul 05, 2006

corrected error in invalidation of dict cache which may be causing the valgrind warning at times

sql/ha_ndbcluster_binlog.cc:
extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/DictCache.cpp:
corrected error in invalidation of dict cache which may be causing the valgrind warning at times
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
extra logging and asserts to try to track down the spurious completeCluster failure assetion

9884e0b6

04 Jul, 2006 20 commits
- Merge bk-internal:/home/bk/mysql-5.1 · 62e29523
  unknown authored Jul 05, 2006
```
into  mysql.com:/data0/knielsen/tmp-5.1
```
  62e29523
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · fb03aa2a
  unknown authored Jul 05, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
  fb03aa2a
- Bug #20077 Cluster to only support partition by key, needs to error on others · 17ea9f74
  unknown authored Jul 05, 2006
  
  17ea9f74
- Bug #20077 Cluster to only support partition by key, needs to error on others · 05f79578
  unknown authored Jul 05, 2006
  
  05f79578
- Merge rt.int.sifira.dk:/usr/local/mysql/mysql-5.1-pristine · 10a97c46
  unknown authored Jul 04, 2006
```
into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.1
```
  10a97c46
- Fix hardcoded /tmp path (which causes problems when running multiple · 4414e249
  unknown authored Jul 04, 2006
```
tests on a single machine) to use $MYSQLTEST_VARDIR/tmp instead.


mysql-test/r/log_state.result:
  Fix hardcoded /tmp/ path.
mysql-test/t/log_state.test:
  Fix hardcoded /tmp/ path.
```
  4414e249
- Bug #20077 Cluster to only support partition by key, needs to error on others · 62897c3e
  unknown authored Jul 04, 2006
  
  62897c3e
- Bug #20742 Assertion in drop of ndb binlog events after node restart · 9a66c3ee
  unknown authored Jul 04, 2006
  
  9a66c3ee
- Bug #20742 Assertion in drop of ndb binlog events after node restart · d3f35813
  unknown authored Jul 04, 2006
```
- make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event
```
  d3f35813
- Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8e83a913
  unknown authored Jul 04, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
  8e83a913
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7e926840
  unknown authored Jul 04, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra


sql/ha_ndbcluster.cc:
  Auto merged
```
  7e926840
- Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5a8075ed
  unknown authored Jul 04, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
  5a8075ed
- disabled ndb_autodiscover3 · 1523245b
  unknown authored Jul 04, 2006
  
  1523245b
- After merge fix · f5d6a8cf
  unknown authored Jul 04, 2006
  
  f5d6a8cf
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 31d5fc50
  unknown authored Jul 04, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  manual merge af packported code to 5.0, use local copy
sql/handler.h:
  manual merge af packported code to 5.0, use local copy
sql/sql_update.cc:
  manual merge af packported code to 5.0, use local copy
```
  31d5fc50
- Bug #20784 Uninitialized memory in update on table with PK not on first column · 5dab95e2
  unknown authored Jul 04, 2006
```
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
```
  5dab95e2
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 767ff946
  unknown authored Jul 04, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  767ff946
- Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge · 83d20ff7
  unknown authored Jul 04, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge


mysys/thr_lock.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/r/lock_multi.result:
  Manual merge
mysql-test/t/lock_multi.test:
  Manual merge
sql/lock.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
```
  83d20ff7
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · f3f95d26
  unknown authored Jul 04, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra


sql/ha_ndbcluster.cc:
  Auto merged
```
  f3f95d26
- Renumber events to make tests pass. This must be a result of removing extraneous · b0d8c39c
  unknown authored Jul 03, 2006
```
COMMITs -- the numbers collapse to fill the gaps.


mysql-test/r/rpl_row_create_table.result:
  Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
  I don't fully understand this, but I can't see any harm to it.
mysql-test/t/rpl_row_create_table.test:
  Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
  I don't fully understand this, but I can't see any harm to it.
```
  b0d8c39c
03 Jul, 2006 6 commits

Removed extraneous COMMITs, from Bug#16206. · 2b827b17
unknown authored Jul 03, 2006

2b827b17

Removed bdb test where the binlog format is indeterminate and updated a test · fb75566a

unknown authored Jul 03, 2006

where it isn't.  Removed a test where the merge was incorrect (and a test 
duplicated.)


mysql-test/r/bdb.result:
  Removed binlog-format-specific test.
  
  Elliot says bdb is going away real soon now anyway.
mysql-test/r/binlog_row_blackhole.result:
  Removed superfluous commits.  Bug#16206.
mysql-test/r/mysqldump.result:
  Merged incorrectly.
mysql-test/t/bdb.test:
  Removed binlog-format-specific test.
  
  Elliot says bdb is going away real soon now anyway.

fb75566a

Additional patch from Bug#16206. BEGIN/COMMIT behavior changed 5.0 -> 5.1 . · fb40aaef
unknown authored Jul 03, 2006

fb40aaef

Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 · 9bf16868

unknown authored Jul 03, 2006

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/mysqldump.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
sql/log.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_table.cc:
  manual merge

9bf16868

Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld · 9245a128
unknown authored Jul 03, 2006

9245a128

ndb - bug#20751 : report also composite op in merge · 6a2217a7

unknown authored Jul 03, 2006


storage/ndb/test/ndbapi/test_event_merge.cpp:
  cannot skip tables if ops specified
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  report even composite op in merge
  test case: test_event_merge --no-blobs --ops ic:dcic

6a2217a7

01 Jul, 2006 5 commits

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 36261213

unknown authored Jul 01, 2006

into  dator5.(none):/home/pappa/bug17138


sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

36261213

Merge dator5.(none):/home/pappa/bug20583 · c44755a6

unknown authored Jul 01, 2006

into  dator5.(none):/home/pappa/bug17138


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

c44755a6

Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 28f548da

unknown authored Jul 01, 2006

into  dator5.(none):/home/pappa/bug20583


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged

28f548da

Merge dator5.(none):/home/pappa/clean-mysql-5.1 · e8513a12

unknown authored Jul 01, 2006

into  dator5.(none):/home/pappa/bug17138


BUILD/compile-pentium-gcov:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

e8513a12

BUG#17138: Crashes in stored procedure · 55a4458d

unknown authored Jul 01, 2006

Last round of review fixes


BUILD/compile-pentium-gcov:
  No change
sql/ha_ndbcluster.h:
  Last round of review changes
sql/ha_partition.h:
  Last round of review changes
sql/handler.h:
  Last round of review changes
sql/item_sum.cc:
  Last round of review changes
sql/sql_acl.cc:
  Last round of review changes
sql/sql_insert.cc:
  Last round of review changes
sql/sql_select.cc:
  Last round of review changes
sql/sql_table.cc:
  Last round of review changes
sql/sql_union.cc:
  Last round of review changes
sql/sql_update.cc:
  Last round of review changes

55a4458d