database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-27 13:04:36 +03:00
Code Activity
54,404 Commits 3,144 Branches 363 Tags
19e2ed7642bb035e522f24b617cdfa6558e901b1
Commit Graph

157 Commits

Author SHA1 Message Date
gni@dev3-221.dev.cn.tlan
43f31db546 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
 2008-01-10 19:49:32 +08:00
gni@dev3-221.dev.cn.tlan
c891d92888 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
 2008-01-10 13:56:21 +08:00
gni@dev3-221.dev.cn.tlan
2351ac241d Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
 2008-01-10 13:47:14 +08:00
mskold/marty@quadfish.(none)
e051994b10 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2007-12-07 10:46:12 +01:00
lzhou/zhl@dev3-63.(none)
04799ddbd9 BUG#29186 Return error to client in the following condition: 
1: Create a log file which is larger than 4G in 32-bit host.
          2: Create a data file (tablespace) which is larger than 4G in 32-bit host.
 2007-11-12 14:53:25 +00:00
knielsen@loke.(none)
328fc573e4 Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca 
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
 2007-10-25 10:48:42 +02:00
knielsen@loke.(none)
815a63008c Merge loke.(none):/home/knielsen/devel/bug31761 
into  loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
 2007-10-25 09:27:15 +02:00
jonas@perch.ndb.mysql.com
ac1dc64ebb ndb - bug#26450 
partial backport from 6.2 + add fix of bug
 2007-10-23 11:24:34 +02:00
jonas@perch.ndb.mysql.com
5aacf8b775 ndb - bug#31482 
(re)impl. simple-read (read that releases lock just before LQHKEYCONF)
  use simple-read for blobs
 2007-10-15 09:10:14 +02:00
pekka@sama.ndb.mysql.com
3dea240a6c Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
 2007-10-04 18:37:49 +02:00
jonas@perch.ndb.mysql.com
836597bbc3 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-05-14 10:39:46 +02:00
jonas@perch.ndb.mysql.com
1305016bdc ndb - bug#28348 
remove LCP files when dropping table
 2007-05-14 10:34:21 +02:00
jonas@perch.ndb.mysql.com
5db64df3dc Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-30 12:57:20 +02:00
jonas@perch.ndb.mysql.com
6559c77022 ndb - bug#28161 
fix commit triggers with DD but not using DD
 2007-04-30 12:56:16 +02:00
tomas@whalegate.ndb.mysql.com
0326179d10 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 13:50:04 +02:00
tomas@whalegate.ndb.mysql.com
3b38c544eb ndb: force varpart part I, allow setting of flag in dictionary 2007-04-26 08:34:38 +02:00
knielsen@ymer.(none)
2c65524328 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-04-25 15:06:03 +02:00
knielsen@ymer.(none)
45e18df811 After-merge fixes. 2007-04-25 15:02:23 +02:00
knielsen@ymer.(none)
ae8f9ac9f3 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-04-24 09:00:13 +02:00
tomas@whalegate.ndb.mysql.com
2c723aa91f Bug #27712 Single user mode. Creating logfile group and tablespace is allowed 2007-04-16 11:43:14 +02:00
jonas@perch.ndb.mysql.com
6b67f57249 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-12 16:00:51 +02:00
jonas@perch.ndb.mysql.com
967eb52b68 ndb - bug#27756 
testcase only
  new pseudo column NDB$COPY_ROWID
 2007-04-12 11:47:38 +02:00
jonas@perch.ndb.mysql.com
d2225f0894 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-10 10:06:04 +02:00
jonas@perch.ndb.mysql.com
ee4a94a0c1 ndb - bug#27728 (5.1) 
Make sure API is connected to nodes when subscribing
 2007-04-10 10:05:01 +02:00
tomas@whalegate.ndb.mysql.com
70fa6a4e5d ndb: change attribute id for ANY_VALUE as id was already reserved for upcoming read pached patch 2007-04-05 12:01:01 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 10:47:40 +08:00
tomas@whalegate.ndb.mysql.com
81ac116dfa Bug #17095 Cluster RBR in circle does not terminate 
- add any value to ndb
- use it to update correct server id in binlog thread
 2007-04-03 12:57:18 +02:00
jonas@perch.ndb.mysql.com
d50539b624 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-27 14:33:18 +02:00
jonas@perch.ndb.mysql.com
e5faf16bc0 ndb - bug#27466 nf during nr can leave cluster in inconsistent state (recommit in 5.1) 
Fix race condition between NODE_FAILREP and local INCL_NODEREQ loop
    Also retry on ZNODE_START_DISALLOWED_ERROR
 2007-03-27 14:27:43 +02:00
tomas@whalegate.ndb.mysql.com
78dce2dd97 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
f4fed734c6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 14:17:08 +01:00
tomas@whalegate.ndb.mysql.com
9899df36bd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
 2007-03-23 14:06:00 +01:00
gni/root@dev3-221.dev.cn.tlan
61dd58beb3 BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message. 2007-03-20 10:36:20 +08:00
jonas@perch.ndb.mysql.com
023ce289b6 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-13 13:56:51 +01:00
jonas@perch.ndb.mysql.com
4a27e9adb9 ndb - bug#27003 
merge to 5.1, adopt testprg to optimized node recovery
 2007-03-13 12:38:47 +01:00
tomas@poseidon.mysql.com
e0ba5ee1ab Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-02 09:17:17 +07:00
tomas@poseidon.mysql.com
60ab46bd87 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-02 09:13:00 +07:00
tomas@poseidon.mysql.com
9f586e3e61 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-02-26 23:50:02 +07:00
tomas@poseidon.mysql.com
6cbc6d91f9 Bug #26490 duplicate cluster error code 
- fixed error code
- added test program run in mysql-test-run bk version
 2007-02-21 11:41:22 +07:00
stewart@willster.(none)
dcb2c39aa7 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
 2007-02-14 21:44:28 +11:00
stewart@willster.(none)
6358a0f48c Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
 2007-02-14 16:37:40 +11:00
tomas@poseidon.mysql.com
e865b5950f Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 11:55:31 +07:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
jonas@perch.ndb.mysql.com
ef283377a9 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
 2007-01-11 21:13:17 +01:00
jonas@perch.ndb.mysql.com
8cf69ddb8b ndb - recommit extra version info to real-51 2007-01-04 10:59:12 +01:00
jonas@perch.ndb.mysql.com
c73b27f59b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-01-03 06:47:23 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2006-12-27 11:01:54 +01:00