Commits · ccdf64153528316c695880e4b92d93a9e1b69a39 · nexedi / MariaDB

03 Apr, 2007 9 commits

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · ccdf6415
unknown authored Apr 03, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
ccdf6415
Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data · c2cde303
unknown authored Apr 03, 2007
```
  - insert gap event on cluster connect
```
c2cde303
Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data · e5a81746
unknown authored Apr 03, 2007
```
- insert gap event on cluster connect
```
e5a81746

Bug #17095 Cluster RBR in circle does not terminate · e0f91f22

unknown authored Apr 03, 2007

- add any value to ndb
- use it to update correct server id in binlog thread


sql/ha_ndbcluster.cc:
  ndb: use "any value" to set correct server_id
sql/ha_ndbcluster_binlog.cc:
  ndb: use "any value" to set correct server_id
storage/ndb/include/kernel/AttributeHeader.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/include/ndbapi/NdbOperation.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  add any_value as psudo column, updatable from ndbapi
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  add any_value as psudo column, updatable from ndbapi

e0f91f22

Bug #26783 replication status unknown after cluster or mysqld failure · 52f82d52
unknown authored Apr 03, 2007
```
- correction, wrong datatype used
```
52f82d52
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 9f855abd
unknown authored Apr 03, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
9f855abd
remove unused List · e4f490c1
unknown authored Apr 03, 2007

e4f490c1

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl · 98398075

unknown authored Apr 03, 2007

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


client/Makefile.am:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

98398075

Bug #26783 replication status unknown after cluster or mysqld failure · 4c669601

unknown authored Apr 03, 2007

- update the ndb_apply_status table with binlog info


BitKeeper/etc/ignore:
  Added client/rpl_constants.h to the ignore list
mysql-test/r/rpl_ndb_stm_innodb.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_stm_innodb.result''
mysql-test/t/rpl_ndb_stm_innodb-master.opt:
  New BitKeeper file ``mysql-test/t/rpl_ndb_stm_innodb-master.opt''
mysql-test/t/rpl_ndb_stm_innodb.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_stm_innodb.test''

4c669601

02 Apr, 2007 18 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5dcc9f9e
unknown authored Apr 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
5dcc9f9e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · cfdee054
unknown authored Apr 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
```
cfdee054
correction of manual merge · 32920463
unknown authored Apr 02, 2007

32920463

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

unknown authored Apr 02, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged

0edddf0a

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · c2b59571
unknown authored Apr 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
```
c2b59571
corrected previos manual merge · 3fa92490
unknown authored Apr 02, 2007

3fa92490
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 67bd9525
unknown authored Apr 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  manual merge
```
67bd9525
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 77758006
unknown authored Apr 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
77758006
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 64c7c89a
unknown authored Apr 02, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
64c7c89a

BUG#27560: Memory usage of mysqld grows while doing nothing · f9315b16

unknown authored Apr 02, 2007

  
The query-cache watch thread was continually allocating new thread entries on the
THD MEM_ROOT, not freed until server exit.
  
Fixed by using a simple array, auto-expanded as necessary.


sql/ha_ndbcluster.cc:
  Use a fixed array (auto-expanded as necessary) for temporary copy of open shares,
  don't keep pushing list entries on the THD mem root.

f9315b16

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · f04a09f0

unknown authored Apr 02, 2007

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


ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged

f04a09f0

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c86e03a2
unknown authored Apr 02, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
c86e03a2

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

unknown authored Apr 02, 2007

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


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  merge

64c8b3a6

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 2c9c4508

unknown authored Apr 02, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged

2c9c4508

ndb - bug#27581 · d71a221d

unknown authored Apr 02, 2007

  make sure not to leave partially initialized pagerage-records


ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  make sure not to leave partially initialized pagerage-records

d71a221d

fix atrt mysql_install_db, make sure no extra my.cnf is read · 22edf825
unknown authored Apr 02, 2007

22edf825
ndb - fix bug in my.cnf config handling · b84e64f7
unknown authored Apr 02, 2007
```
  put64 for 64-bit variables


ndb/src/mgmsrv/InitConfigFileParser.cpp:
  put64
```
b84e64f7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 516b8b21
unknown authored Apr 02, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/sql_select.cc:
  Auto merged
```
516b8b21

01 Apr, 2007 1 commit

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 6494ce83

unknown authored Apr 01, 2007

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/r/row.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

6494ce83

31 Mar, 2007 12 commits
- Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 60f62fa9
  unknown authored Apr 01, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
```
  60f62fa9
- Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · c3bdec10
  unknown authored Apr 01, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  c3bdec10
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0 · ad23e528
  unknown authored Apr 01, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  ad23e528
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 858c06ba
  unknown authored Mar 31, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  858c06ba
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 58d50c88
  unknown authored Mar 31, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
```
  58d50c88
- New test case shows valgrind failure (disabling this · ad4d67b6
  unknown authored Mar 31, 2007
```
new test case until the valgrind failure is fixed, 
reported in bug 27564)


mysql-test/t/disabled.def:
  New test case shows valgrind failre
```
  ad4d67b6
- Fix to rpl_row_create_table test. · 810fdd6c
  unknown authored Mar 31, 2007
```
mysql-test/t/rpl_row_create_table.test:
  Adding sync to allow slave to complete cleanup drop before resetting
  storage engine.
```
  810fdd6c
- GLOBAL DEBUG variable does not work · 7705946d
  unknown authored Mar 31, 2007
  
  7705946d
- Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 04844b07
  unknown authored Mar 31, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
```
  04844b07
- Avoiding SESSION with debug, since it does not work in valgrind · db4c9754
  unknown authored Mar 31, 2007
  
  db4c9754
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 1139dde7
  unknown authored Mar 31, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
```
  1139dde7
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 0c6731fd
  unknown authored Mar 31, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
```
  0c6731fd