mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36469 commits 2778 branches 343 tags 1.6 GiB
Commit graph

981 commits

Author SHA1 Message Date
evgen@sunlight.local
ef4f149536 Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-07-30 00:33:24 +04:00
kostja@bodhi.local
4bd7acec3f Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-28 18:02:38 +04:00
kostja@bodhi.local
024960aa2d Post-merge fixes. 2006-07-27 14:12:41 +04:00
msvensson@neptunus.(none)
e47f61a01c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-07-27 05:55:42 +02:00
kostja@bodhi.local
73189969f3 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-07-26 23:33:25 +04:00
pekka@orca.ndb.mysql.com
4a1bf59e22 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my51 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
 2006-07-26 20:40:20 +02:00
pekka@orca.ndb.mysql.com
a920df9c04 ndb - bug#14935 - post-review 2006-07-26 20:03:41 +02:00
ingo/mydev@chilla.local
cf708395e9 After merge fix 2006-07-24 10:53:26 +02:00
stewart@willster.(none)
1496303771 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/main
 2006-07-24 02:32:49 +10:00
pekka@orca.ndb.mysql.com
15783e44d0 ndb - bug#14935 fix 2006-07-19 14:49:58 +02:00
msvensson@neptunus.(none)
fe40a8cf9d Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-07-19 08:57:52 +02:00
pekka@orca.ndb.mysql.com
6da1b59c08 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51
 2006-07-15 18:02:47 +02:00
pekka@orca.ndb.mysql.com
54571ec6ad ndb - ndb_restore: print some dd errors at right verbosity 2006-07-15 17:53:57 +02:00
tsmith/tim@siva.hindu.god
6971ddee1a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
 2006-07-15 00:33:24 -06:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +04:00
kostja@bodhi.local
99fefab169 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 11:43:52 +04:00
cmiller@zippy.(none)
9be1c70404 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-07-10 13:38:22 -04:00
pekka@orca.ndb.mysql.com
4163c91d8e ndb - debug stuff in LQH 2006-07-10 15:43:47 +02:00
pekka@orca.ndb.mysql.com
a3dcbff671 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
 2006-07-10 14:07:40 +02:00
pekka@orca.ndb.mysql.com
d525409ba3 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
 2006-07-10 13:54:26 +02:00
ingo/mydev@chilla.local
4cdb1469e0 Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-08 10:54:54 +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
ingo/mydev@chilla.local
49587d4b37 Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-07 09:14:09 +02:00
ingo@chilla.local
1a98b89334 Merge chilla.local:/home/mydev/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-06 21:45:15 +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
ingo@chilla.local
db0e7774aa Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.1-ateam
 2006-07-06 13: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
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
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
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
cmiller@zippy.(none)
91b8b26411 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-07-05 16:16:09 -04: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
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
pekka@clam.ndb.mysql.com
38d63c303a ndb - ndb api : try to catch autoincr 'error 0' 2006-07-05 17:36:19 +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
mskold@mysql.com
7c650824dc Bug #19645 Data Node hangs in phase 100: post review fix, removed test printout 2006-07-05 15:32:17 +02:00
mskold@mysql.com
d951bc61ff Bug #19645 Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected 2006-07-05 15:04:47 +02:00
tomas@poseidon.ndb.mysql.com
1b7da4b8ed extra logging and asserts to try to track down the spurious completeCluster failure assetion 
corrected error in invalidation of dict cache which may be causing the valgrind warning at times
 2006-07-05 14:20:14 +02:00
tomas@poseidon.ndb.mysql.com
0a75f5fe0a 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 01:56:38 +02:00
tomas@poseidon.ndb.mysql.com
980852eed3 Bug #20742 Assertion in drop of ndb binlog events after node restart 2006-07-04 17:58:20 +02:00
tomas@poseidon.ndb.mysql.com
6512316c3a Bug #20742 Assertion in drop of ndb binlog events after node restart 
- make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event
 2006-07-04 17:37:44 +02:00
mskold@linux.site
9509145a9d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra
 2006-07-04 12:57:24 +02:00
tomas@poseidon.ndb.mysql.com
8a2694e25f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-07-04 11:21:19 +02:00
mskold@linux.site
f5fb7ef27a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra
 2006-07-04 09:17:32 +02:00
mskold@mysql.com
59d69f6d38 Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld 2006-07-03 17:09:32 +02:00
pekka@clam.ndb.mysql.com
ea794df45a ndb - bug#20751 : report also composite op in merge 2006-07-03 12:13:57 +02:00
jonas@perch.ndb.mysql.com
05f14b144b Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-30 11:26:47 +02:00
jonas@perch.ndb.mysql.com
75c9f3cd01 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-06-30 11:26:10 +02:00
jonas@perch.ndb.mysql.com
bc621b6418 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-06-30 11:18:31 +02:00