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

38855 commits

This branch
This branch
All branches
Author SHA1 Message Date
dli@dev3-76.dev.cn.tlan
f908b0dd0b Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
 2006-10-13 09:38:41 +08:00
jonas@perch.ndb.mysql.com
06eb6c1b95 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-12 19:01:15 +02:00
jonas@perch.ndb.mysql.com
a54087870c Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-12 18:58:52 +02:00
jonas@perch.ndb.mysql.com
d5d6582f7d ndb - missing if for bug#21941 
note this does not happen in 5.0, but i'm committing it here to keep code same between 5.0 and 5.1
 2006-10-12 18:55:22 +02:00
jonas@perch.ndb.mysql.com
cce815f787 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-12 14:09:03 +02:00
jonas@perch.ndb.mysql.com
32ded2a607 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-12 14:04:20 +02:00
jonas@perch.ndb.mysql.com
564d461fa4 ndb - bug#23210 
Fix race-condition between COPY_GCIREQ (GCP) and lcpSetActiveStatusEnd
  Solution is _not_ to copy sysfileData from COPY_GCIREQ from "self"
 2006-10-12 14:02:48 +02:00
dli@dev3-76.dev.cn.tlan
352a9f64d2 fixed for BUG#21519, 'MySQLD Err msg "Management server closed connection" needs date & time stamp'. 
added date & time stamp for the messages that will be printed to the mysqld message file.
 2006-10-12 10:31:27 +08:00
pekka@orca.ndb.mysql.com
375faa3b52 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-10-11 05:16:50 +02:00
jonas@perch.ndb.mysql.com
84e4df338d Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 15:27:47 +02:00
jonas@perch.ndb.mysql.com
94b8e56144 ndb - 
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
 2006-10-10 15:26:39 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:25:24 +02:00
jonas@perch.ndb.mysql.com
fe61968dc8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:08:23 +02:00
jonas@perch.ndb.mysql.com
5590e99d2e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-10 11:06:51 +02:00
jonas@perch.ndb.mysql.com
c301735962 ndb - bug#23107 
fix bug in test prg
 2006-10-10 09:47:30 +02:00
jonas@perch.ndb.mysql.com
d25765d116 ndb - bug#23107 
fix bug in handling of inactive timeout for scan, when all is delivered
 2006-10-10 09:37:54 +02:00
pekka@orca.ndb.mysql.com
e524d16707 ndb - tux scan 5.1 post-merge fix 2006-10-09 20:46:29 +02:00
pekka@orca.ndb.mysql.com
b084401165 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
 2006-10-09 16:40:57 +02:00
pekka@orca.ndb.mysql.com
2fc65dbabd ndb - bug#20446: fix + other TUX scan improvements 2006-10-09 16:13:32 +02:00
pekka@orca.ndb.mysql.com
ae1b40ba05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
 2006-10-09 14:44:40 +02:00
pekka@orca.ndb.mysql.com
b83200e6f0 ndb - bug#20446: test case and cleanups (not fix) 2006-10-09 12:35:11 +02:00
svoj@april.(none)
cab855cac1 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-10-08 22:35:27 +05:00
svoj@mysql.com/april.(none)
0830486836 After merge fix. 2006-10-08 22:34:32 +05:00
svoj@may.pils.ru
0ea6959d78 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
 2006-10-08 15:32:00 +05:00
jonas@perch.ndb.mysql.com
007311c6fd ndb - bug#22893 
Add checking of REDO to earlier during SR
      so take-over of node can be performed
      if it can't be restarted using logs
      (which btw is really weird...as it _should_ be able to use logs of other node in node group)

  Otherwise cluster could be started and 1 fragment on one node could not have been restored
  Making the cluster inconsisten, VERY BAD
 2006-10-06 16:05:46 +02:00
svoj@april.(none)
1b5c111cf8 Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.1-engines
 2006-10-06 15:31:11 +05:00
svoj@mysql.com/april.(none)
8f4b0d946a Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines
 2006-10-06 15:29:30 +05:00
svoj@mysql.com/april.(none)
09b2a2a056 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines
 2006-10-06 15:18:25 +05:00
svoj@mysql.com/april.(none)
1e82044cd6 BUG#22937 - Valgrind failure in 'merge' test (ha_myisammrg.cc:329) 
This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.
 2006-10-06 15:17:42 +05:00
svoj@april.(none)
c2f1876816 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
 2006-10-06 14:55:57 +05:00
svoj@mysql.com/april.(none)
60ba9f2b63 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-06 14:49:21 +05:00
svoj@mysql.com/april.(none)
6a1a765b5d Per discussion with pekka removed non-deterministic test case for bug#21381. 2006-10-06 14:47:58 +05:00
svoj@mysql.com/april.(none)
dad1283cc8 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 11:11:47 +05:00
svoj@april.(none)
ad85dccae4 Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.1-engines
 2006-10-06 11:09:58 +05:00
svoj@mysql.com/april.(none)
ee4080f9f9 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 11:03:14 +05:00
svoj@mysql.com/april.(none)
94040c54b3 Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines
 2006-10-06 11:01:39 +05:00
svoj@mysql.com/april.(none)
c67aa031d6 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 10:54:47 +05:00
svoj@mysql.com/april.(none)
5d096b89f2 After merge fix. 2006-10-06 00:22:41 +05:00
svoj@april.(none)
77cb275b70 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
 2006-10-05 21:15:12 +05:00
svoj@mysql.com/april.(none)
d41340516f Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-05 19:02:29 +05:00
svoj@mysql.com/april.(none)
16c13a588f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
 2006-10-05 18:56:10 +05:00
svoj@mysql.com/april.(none)
b141a7c1b9 BUG#21381 - Engine not notified about multi-table UPDATE IGNORE 
Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.
 2006-10-05 18:23:53 +05:00
stewart@willster.(none)
3da31030d6 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Manually merge smaller 5.0 fix with fix-with-test and list sessions for 5.1
 2006-10-05 23:19:14 +10:00
stewart@willster.(none)
3551165c90 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb
 2006-10-05 23:13:29 +10:00
jonas@perch.ndb.mysql.com
0b5ad7f38b ndb - bug#17929 
guess which scan type to use in handler
 2006-10-05 14:25:18 +02:00
stewart@willster.(none)
c321ae2f0c BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd 
smaller patch for 5.0.

complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc
 2006-10-05 18:51:13 +10:00
brian@zim.(none)
faff46eefe Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
jonas@perch.ndb.mysql.com
8b79063de7 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-10-05 09:39:59 +02:00
stewart@willster.(none)
276aaa2164 BUG#20809 mysqldump does not backup TS and LG information correctly 
restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.
 2006-10-05 00:56:06 +10:00
jonas@perch.ndb.mysql.com
9cad0a01b7 ndb - bug#22892 
Make sure checkKeepGci is also run on oldStoredReplicas
      to prevent keepgci to move backwards when crash node restarts
 2006-10-04 12:05:24 +02:00