Commits · b5a61001322ebbaa22910a72f30ff23f9fdb471c · nexedi / MariaDB

03 Jul, 2007 3 commits

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

unknown authored Jul 03, 2007

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


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

b5a61001

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

unknown authored Jul 03, 2007

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


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

fb349433

ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) · d55ca617

unknown authored Jul 03, 2007

  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

d55ca617

02 Jul, 2007 4 commits

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

unknown authored Jul 02, 2007

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


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

766525d9

ndb - bug#29364 - port merge (5.0 -> 5.1) · 0095218a
unknown authored Jul 02, 2007

0095218a

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

unknown authored Jul 02, 2007

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


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

0b4041f3

ndb - bug#29364 - "SQL queries hang while data node in start phase 5" · f83a63ad

unknown authored Jul 02, 2007

  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

f83a63ad

30 Jun, 2007 4 commits

disable with bug no · 0b079d97
unknown authored Jun 30, 2007

0b079d97
ndb test suite cleanup + making ndb_autodiscover3 less flaky · 3f59098a
unknown authored Jun 30, 2007

3f59098a

[PATCH] Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset · 5629c496

unknown authored Jun 30, 2007

Test that we can start a MySQL Server with a default multibyte charset with
NDB running. Test *really* basic functionality too.

Index: ndb-work/mysql-test/r/rpl_ndb_ctype_ucs2_def.result
===================================================================


mysql-test/r/rpl_ndb_ctype_ucs2_def.result:
  Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt:
  Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
mysql-test/t/rpl_ndb_ctype_ucs2_def.test:
  Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

5629c496

[PATCH] BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset · 60f3384c

unknown authored Jun 30, 2007

NDB util thread calls mysql_parse internally with plain old c strings (7bit ascii) to create tables (e.g. mysql.ndb_schema). With mysqld default charset set to a multibyte one (e.g. ucs2) mysql_parse would try to interpret the 7bit string as UCS2 and promptly explode in a heap.

Solution is to set the util thread to be using utf8 charset.

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


sql/ha_ndbcluster.cc:
  BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset

60f3384c

27 Jun, 2007 1 commit
- correct include file · 0a65e666
  unknown authored Jun 27, 2007
  
  0a65e666
26 Jun, 2007 3 commits

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

unknown authored Jun 26, 2007

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge

3a621bbc

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · b367a80e
unknown authored Jun 26, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
b367a80e

ndb - bug#29331 (51) · b4199e91

unknown authored Jun 26, 2007

    Add better handling of GCP Stop
    Only kill "offending" node


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  add new error codes
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add better GCP stop handling
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add better GCP stop handling

b4199e91

25 Jun, 2007 6 commits

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51-gca · 830b7579
unknown authored Jun 25, 2007
```
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug29176
```
830b7579

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

unknown authored Jun 25, 2007

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

56c68a47

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · ea88a770
unknown authored Jun 25, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
ea88a770
ndb - post merge 50/51 - bug#29057 bug#29067 and bug#29118 · 5201c499
unknown authored Jun 25, 2007
```
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  post merge
```
5201c499

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

unknown authored Jun 25, 2007

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge

baa4324b

ndb - bug#29057 bug#29067 and bug#29118 · f86ecc03

unknown authored Jun 25, 2007

  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

f86ecc03

24 Jun, 2007 1 commit
- ndb - bug#29176 pgman: another missing stack pruning related to drop table · 8cafb450
  unknown authored Jun 24, 2007
```
storage/ndb/src/kernel/blocks/pgman.cpp:
  another missing pgman stack pruning related to drop_page
```
  8cafb450
22 Jun, 2007 1 commit
- updated for bug#28770 · 98a0b452
  unknown authored Jun 22, 2007
  
  98a0b452
21 Jun, 2007 3 commits

select_ndb_apply_status.inc: · 12807651

unknown authored Jun 21, 2007

  new support file that I missed during last check ing, sorry


mysql-test/include/select_ndb_apply_status.inc:
  new support file that I missed during last check ing, sorry

12807651

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · ff53a753

unknown authored Jun 21, 2007

into  mysql.com:/data2/mysql-5.1-new-ndb


mysql-test/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
  SCCS merged

ff53a753

Many files: · 3e8df21a

unknown authored Jun 21, 2007

  New test cases for generic apply status table
rpl_ndb_dd_advance.test:
  Updated test case to not run sooo long
show_binlog_using_logname.inc, tpcb_disk_data.inc:
  New support file 
rpl_ndb_dd_advance.result:
  Updated result
tpcb.inc:
  New support file for Updated test case to not run sooo long


mysql-test/t/rpl_ndb_dd_advance.test:
  Updated test case to not run sooo long
mysql-test/include/tpcb.inc:
  New support file for Updated test case to not run sooo long
mysql-test/r/rpl_ndb_dd_advance.result:
  Updated result
mysql-test/t/rpl_ndb_mix_innodb.test:
  New test cases for generic apply status table
mysql-test/t/rpl_ndb_stm_innodb.test:
  New test cases for generic apply status table
mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test:
  New test cases for generic apply status table
mysql-test/t/rpl_ndb_stm_innodb-master.opt:
  New test cases for generic apply status table
mysql-test/t/rpl_ndb_mix_innodb-master.opt:
  New test cases for generic apply status table
mysql-test/include/tpcb_disk_data.inc:
  New support file
mysql-test/include/show_binlog_using_logname.inc:
  New support file
mysql-test/r/rpl_ndb_stm_innodb.result:
  New test cases for generic apply status table
mysql-test/r/rpl_ndb_mix_innodb.result:
  New test cases for generic apply status table

3e8df21a

20 Jun, 2007 2 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · e258e234
  unknown authored Jun 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  e258e234
- Bug #29229 memory corruption in dbtup · 6b25b945
  unknown authored Jun 20, 2007
  
  6b25b945
19 Jun, 2007 6 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · f644f34e
  unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.h:
  Auto merged
```
  f644f34e
- Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown · 897d4dfb
  unknown authored Jun 19, 2007
  
  897d4dfb
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 7d74c33d
  unknown authored Jun 19, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.h:
  Auto merged
```
  7d74c33d
- Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown · 228fc721
  unknown authored Jun 19, 2007
  
  228fc721
- corrected typo · e41a27b9
  unknown authored Jun 19, 2007
  
  e41a27b9
- turn off binlogging of the updates during wait for not_readonly · 68db008c
  unknown authored Jun 19, 2007
  
  68db008c
18 Jun, 2007 6 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · ea8934c5

unknown authored Jun 18, 2007

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


storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

ea8934c5

check for different error message · 76eb66ea
unknown authored Jun 18, 2007

76eb66ea
ndb - bug#29176 missing stack pruning in drop_page · ccb8da82
unknown authored Jun 18, 2007
```
storage/ndb/src/kernel/blocks/pgman.cpp:
  missing stack pruning in drop_page
```
ccb8da82
correction · a2002da6
unknown authored Jun 18, 2007

a2002da6
Bug #28989 hpux11 ps_row warnings · 2e08341c
unknown authored Jun 18, 2007
```
- also remove printout for error 4009
```
2e08341c

fixes Bug #25305 (and several other similar test tailures with the same symptom) · 2c631fe8

unknown authored Jun 18, 2007

- make tests wait until ndb connects properly


mysql-test/extra/rpl_tests/rpl_commit_after_flush.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_delete_no_where.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_log.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_001.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_func003.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
  make tests wait until ndb connects properly
mysql-test/include/have_multi_ndb.inc:
  make tests wait until ndb connects properly
mysql-test/include/have_ndb.inc:
  make tests wait until ndb connects properly
mysql-test/include/ndb_not_readonly.inc:
  make tests wait until ndb connects properly
mysql-test/t/rpl_commit_after_flush.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_delete_no_where.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_UUID.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_auto_inc.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_bank.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_basic.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_charset.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular_simplex.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_commit_afterflush.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_advance.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_basic.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_partitions.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_ddl.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_delete_nowhere.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_db.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_table.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_extraCol.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_func003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_idempotent.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb2ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb_trans.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_load.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_myisam2ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_rep_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_row_001.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp006.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_stm_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sync.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_trig004.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndbapi_multi.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_001.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_UUID.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_2myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_3innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_7ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_charset.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_func003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_log_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp006_InnoDB.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_stm_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_truncate_7ndb.test:
  make tests wait until ndb connects properly
mysql-test/include/ndb_master-slave.inc:
  New BitKeeper file ``mysql-test/include/ndb_master-slave.inc''

2c631fe8