mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35819 commits 2791 branches 343 tags 1.7 GiB
Commit graph

35819 commits

This branch
This branch
All branches
Author SHA1 Message Date
konstantin/kostja@bodhi.local
45b70962ba 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
tomas@poseidon.ndb.mysql.com
e64e6d3caf 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
tomas@poseidon.ndb.mysql.com
5ab4800fc2 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
konstantin/kostja@bodhi.local
377e0862ca Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
konstantin/kostja@bodhi.netgear
a1f7b448e4 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
konstantin/kostja@bodhi.netgear
35b6ad7968 Another post-merge fix. 2006-07-07 13:49:43 +04:00
konstantin@bodhi.netgear
343a5244dc After merge fixes. 2006-07-07 03:07:45 +04:00
konstantin@bodhi.netgear
4e23f9756d 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
tomas@poseidon.ndb.mysql.com
5e3861cb95 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
tomas@poseidon.ndb.mysql.com
6a6bd5b182 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
konstantin@bodhi.netgear
01bc761690 Merge bodhi.netgear:/opt/local/work/tmp_merge 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
 2006-07-06 22:55:48 +04:00
konstantin@bodhi.netgear
f22a50a93b Merge bodhi.netgear:/opt/local/work/mysql-5.1-root 
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-06 22:26:47 +04:00
tomas@poseidon.ndb.mysql.com
8f613e9263 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 20:04:48 +02:00
tomas@poseidon.ndb.mysql.com
1db0b2c6a6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 19:02:38 +02:00
tomas@poseidon.ndb.mysql.com
4199719438 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
joerg@trift2.
dcf85ebec4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into trift2.:/M51/bug20216-5.1
 2006-07-06 17:58:31 +02:00
joerg@trift2.
26b7bc8eab 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
tomas@poseidon.ndb.mysql.com
a9348557b2 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
tomas@poseidon.ndb.mysql.com
deb1884cef corrected result file 
- missing order by
 2006-07-06 15:51:13 +02:00
tomas@poseidon.ndb.mysql.com
bcd8fab178 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 15:23:23 +02:00
tomas@poseidon.ndb.mysql.com
9944e41f6e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-07-06 15:20:22 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69 backport of ndb DictCache fix 
- don't invalidate tables that are in state RETRIEVING
 2006-07-06 15:18:00 +02:00
jonas@perch.ndb.mysql.com
200deaa99e 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
tomas@poseidon.ndb.mysql.com
4d0d6cff98 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
tomas@poseidon.ndb.mysql.com
e2db01e3bc 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
tomas@poseidon.ndb.mysql.com
42d549a9dd corrected results 2006-07-06 10:20:49 +02:00
jonas@perch.ndb.mysql.com
88f816a0fd Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-06 09:40:04 +02:00
jonas@perch.ndb.mysql.com
f5ec695c18 ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
mskold@linux.site
0c5c9e174b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-07-06 09:08:39 +02:00
ngrishakin@ndb15.mysql.com
8d82e2c63a 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
ngrishakin@mysql.com
9323799bb4 ndb_dd_advance test cases 2006-07-06 04:37:03 +02:00
tomas@poseidon.ndb.mysql.com
55a9bab25e 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
 2006-07-06 01:33:53 +02:00
ngrishakin@mysql.com
58c27909e0 .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
 2006-07-05 23:50:29 +02:00
ngrishakin@ndb15.mysql.com
1e84c7997c 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
tomas@poseidon.ndb.mysql.com
25ea9964dc disabled ndb_autodiscover3 again 2006-07-05 23:12:48 +02:00
joerg@trift2.
bf3f0b3806 Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2006-07-05 21:47:09 +02:00
tomas@poseidon.ndb.mysql.com
1d5969c8bd 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
tomas@poseidon.ndb.mysql.com
06ac56e61c Bug #20843 tests fails randomly with assertion in completeClusterFailed 
- reenabled test as this now seems fixed
 2006-07-05 21:44:11 +02:00
tomas@poseidon.ndb.mysql.com
f822477297 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 20:31:32 +02:00
tomas@poseidon.ndb.mysql.com
f413bc2fe8 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
tomas@poseidon.ndb.mysql.com
4f2becc9d3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 20:23:23 +02:00
tomas@poseidon.ndb.mysql.com
aacb705613 Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails 
- updated error message to more correctly reflect the issue
 2006-07-05 20:20:39 +02:00
joerg@mysql.com
c9dc1184fd Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does). 2006-07-05 20:17:04 +02:00
tomas@poseidon.ndb.mysql.com
62eba085d5 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-05 18:52:43 +02:00
tomas@poseidon.ndb.mysql.com
26e39baca1 added warning on cluster reconnect and binlog usage, that data may be missing 2006-07-05 18:36:18 +02:00
pekka@clam.ndb.mysql.com
38d63c303a ndb - ndb api : try to catch autoincr 'error 0' 2006-07-05 17:36:19 +02:00
tomas@poseidon.ndb.mysql.com
7b876a71d0 Bug #20843 tests fails randomly with assertion in completeClusterFailed 2006-07-05 17:36:18 +02:00
mskold@linux.site
75a6a16a19 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-07-05 16:30:14 +02:00
joerg@trift2.
1746d41862 Merge mysql.com:/M50/tmp_merge_kent into mysql.com:/M51/merge-kent-5.1 2006-07-05 16:30:13 +02:00
tomas@poseidon.ndb.mysql.com
cdec019fd3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 16:30:12 +02:00