mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35828 commits 2779 branches 343 tags 1.6 GiB
Commit graph

35828 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
7c19c7d217 ndb - bug#21283 
this test in its current form depend on binlog format row
 2006-08-10 13:33:49 +02:00
unknown
e7fbb26c2a ndb - bug#21363 
add file that got missing from last changset
 2006-08-09 10:41:22 +02:00
unknown
87a539a6e5 ndb - bug#21363 
Add extra sleeps (conditionally) if user-ndb-object still exists during shutdown
  Note: This is not in anyway optimal, but i dont't really know in which order should be shutdown
        but it fixes problem...


sql/ha_ndbcluster_binlog.cc:
  Add extra wait loop to make user "user" ndb-object go away...
    otherwise user thread can have ongoing SUB_DATA
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/Ndbif.cpp:
  Add return in case of incorrect magic
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Add interface for getting active ndb-object count
 2006-08-09 10:22:09 +02:00
unknown
d0baba6114 Bug #20843 tests fails randomly with assertion in completeClusterFailed 
Bug #20902 Alter table invalid schema version with statement-based binlogging
(latter caused by the above)
 2006-07-08 03:26:13 +02:00
unknown
4e14d3b77f Merge bk-internal:/home/bk/mysql-5.1 
into  devsrv-b.mysql.com:/data0/knielsen/tmp-5.1
 2006-07-07 20:33:46 +02:00
unknown
60403d32f1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
 2006-07-07 20:51:48 +04:00
unknown
998162c014 Merge knielsen@knielsen.mysql.internal:/usr/local/mysql/tmp-5.1 
into  devsrv-b.mysql.com:/data0/knielsen/tmp-5.1
 2006-07-07 17:52:14 +02:00
unknown
306ab5d29b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-07 17:52:13 +02:00
unknown
109504e202 Bug #20897 race condition between drop table and suma drop trigger 
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
 2006-07-07 17:50:45 +02:00
unknown
719248524e BUG#20902: Test failure in ndb_alter_table3 with statement-based binlogging 
Disable test cases ndb_alter_table3, ndb_autodiscover3, ndb_dd_advance,
and ndb_multi in statement-based binlogging mode until bug can be fixed.


mysql-test/t/ndb_alter_table3.test:
  Disable test in statement-based binlogging mode.
mysql-test/t/ndb_autodiscover3.test:
  Disable test in statement-based binlogging mode.
mysql-test/t/ndb_dd_advance.test:
  Disable test in statement-based binlogging mode.
mysql-test/t/ndb_multi.test:
  Disable test in statement-based binlogging mode.
 2006-07-07 17:20:49 +02:00
unknown
3bba8f5dfb Fixes for Windows compilation failures. 
server-tools/instance-manager/parse.h:
  Post-merge fixes: fix Windows build.
sql/log_event.cc:
  uint32 -> uint
sql/rpl_filter.cc:
  uint32 -> uint
sql/rpl_filter.h:
  uint32 -> uint
 2006-07-07 16:14:07 +04:00
unknown
89e2fba47f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
 2006-07-07 13:51:47 +04:00
unknown
57a2055775 Another post-merge fix. 
sql/events.cc:
  Fix a bug I introduced with the merge: dbchanged is read
  even if it's not passed to sp_use_new_db.
 2006-07-07 13:49:43 +04:00
unknown
71e84df08a After merge fixes. 
sql/event_timed.cc:
  After merge fixes: dbname can never be NULL.
sql/events.cc:
  After merge fixes: use a new signature of sp_use_new_db
sql/sp_head.cc:
  After merge fixes: replace assert with an if for events code to work.
sql/sql_parse.cc:
  After merge fixes: put back free_items, it's used in partitioning.
  Whether it is not a bug is to be investigated.
  Remove check_db_used, as planned.
 2006-07-07 03:07:45 +04:00
unknown
07b95e602d Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 
into  ymer.(none):/usr/local/mysql/tmp-5.1


mysql-test/t/wait_timeout.test:
  Auto merged
 2006-07-07 00:18:03 +02:00
unknown
16c54768ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-07 02:18:02 +04:00
unknown
9d332ef794 removed alter table partition error test since it cannot be made predictable... name will change of created file 2006-07-07 00:18:01 +02:00
unknown
224082fc6b BUG#19951: Race conditions in test wait_timeout. 
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.


mysql-test/r/wait_timeout.result:
  Fix two races in test.
mysql-test/t/wait_timeout.test:
  Fix two races in test.
 2006-07-06 23:49:09 +02:00
unknown
c21a6eda3d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 21:30:55 +02:00
unknown
df9b4754b7 Merge bodhi.netgear:/opt/local/work/tmp_merge 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0


mysql-test/r/create.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
include/my_sys.h:
  Manual merge (second attempt).
mysql-test/r/bdb.result:
  Manual merge (second attempt).
mysql-test/t/bdb.test:
  Manual merge (second attempt).
mysys/my_malloc.c:
  Manual merge (second attempt).
mysys/safemalloc.c:
  Manual merge (second attempt).
sql/ha_federated.cc:
  Manual merge (second attempt).
sql/log_event.cc:
  Manual merge (second attempt).
sql/set_var.cc:
  Manual merge (second attempt).
sql/set_var.h:
  Manual merge (second attempt).
sql/slave.cc:
  Manual merge (second attempt).
sql/slave.h:
  Manual merge (second attempt).
sql/sql_class.h:
  Manual merge (second attempt).
sql/sql_table.cc:
  Manual merge (second attempt).
sql/sql_udf.cc:
  Manual merge (second attempt).
sql/sql_yacc.yy:
  Manual merge (second attempt).
 2006-07-06 22:55:48 +04:00
unknown
d2b4e9c8e2 Merge bodhi.netgear:/opt/local/work/mysql-5.1-root 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
 2006-07-06 22:26:47 +04:00
unknown
925fba7a03 Bug #20820 auto inc table not handled correctly when restored from cluster backup 
mysql-test/t/ndb_dd_backuprestore.test:
  make sure only run in default cluster
mysql-test/t/rpl_ndb_dd_advance.test:
  make sure only run in default cluster
mysql-test/t/rpl_ndb_sync.test:
  make sure only run in default cluster
 2006-07-06 20:04:48 +02:00
unknown
b78304d215 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


mysql-test/r/ndb_restore.result:
  manual merge
mysql-test/t/ndb_restore.test:
  manual merge
storage/ndb/tools/restore/consumer_restore.cpp:
  manual merge
 2006-07-06 19:02:38 +02:00
unknown
ce554d56a4 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
unknown
b8057c4af0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into trift2.:/M51/bug20216-5.1


scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
 2006-07-06 17:58:31 +02:00
unknown
1ceab206b9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into trift2.:/M51/merge-5.1
 2006-07-06 15:52:39 +02:00
unknown
9a15154f47 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 15:52:38 +02:00
unknown
f523685c66 corrected result file 
- missing order by
 2006-07-06 15:51:13 +02:00
unknown
088aad5de9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
 2006-07-06 15:23:23 +02:00
unknown
123c0a98b4 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
 2006-07-06 15:20:22 +02:00
unknown
7997d847f2 backport of ndb DictCache fix 
- don't invalidate tables that are in state RETRIEVING
 2006-07-06 15:18:00 +02:00
unknown
e7340d5c62 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-06 12:11:14 +02:00
unknown
7d8ea6929b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 12:11:13 +02:00
unknown
086fef65ab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 10:29:00 +02:00
unknown
fc3aad740a corrected results 2006-07-06 10:20:49 +02:00
unknown
49daaae036 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged
 2006-07-06 09:40:04 +02:00
unknown
0890735c7a ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
unknown
66764473a0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
 2006-07-06 09:08:39 +02:00
unknown
34349ad272 Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new-ndb
 2006-07-06 04:37:53 +02:00
unknown
d191fb6300 ndb_dd_advance test cases 
mysql-test/t/ndb_dd_advance.test:
  ndb_dd_advance.test
mysql-test/t/ndb_dd_advance2.test:
  ndb_dd_advance2.test
mysql-test/r/ndb_dd_advance.result:
  ndb_dd_advance.result
mysql-test/r/ndb_dd_advance2.result:
  ndb_dd_advance2.result
 2006-07-06 04:37:03 +02:00
unknown
5a90386708 Bug #20843 tests fails randomly with assertion in completeClusterFailed 
- flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Bug #20843 tests fails randomly with assertion in completeClusterFailed
  reenabled test
 2006-07-06 01:33:53 +02:00
unknown
e8d7da1116 .del-ndb_dd_advance.result~165b282a93715547: 
Delete: mysql-test/r/ndb_dd_advance.result
.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test


BitKeeper/deleted/.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test
BitKeeper/deleted/.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
BitKeeper/deleted/.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
BitKeeper/deleted/.del-ndb_dd_advance.result~165b282a93715547:
  Delete: mysql-test/r/ndb_dd_advance.result
 2006-07-05 23:50:29 +02:00
unknown
2717581764 Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
 2006-07-05 23:12:49 +02:00
unknown
79a2d0521d disabled ndb_autodiscover3 again 2006-07-05 23:12:48 +02:00
unknown
066cac122d Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 
mysql-test/mysql-test-run.pl:
  Auto merged
 2006-07-05 21:47:09 +02:00
unknown
04b85ab689 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 21:47:08 +02:00
unknown
f82e49b2b6 Bug #20843 tests fails randomly with assertion in completeClusterFailed 
- reenabled test as this now seems fixed
 2006-07-05 21:44:11 +02:00
unknown
273be51d73 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
 2006-07-05 20:31:32 +02:00
unknown
623f8beec0 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
unknown
0b44f4b171 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
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
 2006-07-05 20:23:23 +02:00