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
45242 commits 2779 branches 343 tags 1.6 GiB
Commit graph

121 commits

Author SHA1 Message Date
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
tomas@whalegate.ndb.mysql.com
deec4449ac Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 
- try to catch as many malloc failures as possible and give error messages
(more for 5.1)
 2007-04-11 18:10:45 +02:00
tomas@whalegate.ndb.mysql.com
da1ebc7fce Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-11 15:51:09 +02: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
tomas@whalegate.ndb.mysql.com
d4982247cf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 20:57:10 +02:00
tomas@whalegate.ndb.mysql.com
d5f63f25c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 21:50:57 +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
stewart@mysql.com[stewart]
acb61e810c [PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts 
Default timout of 30secs for ConfigRetriever

Default timout of 5sec for use by Transporter (ports etc).

And Ndb_cluster_connection::set_timeout() api for setting timeout from
NDBAPI applications. Should be called before connect. e.g.

c.set_timeout(4200);
c.connect();

Index: ndb-work/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
===================================================================
 2007-03-22 22:35:31 +11:00
tomas@poseidon.mysql.com
f4e0bc78dd Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-09 01:01:20 +07:00
tomas@poseidon.mysql.com
e4eb1c0087 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-08 15:57:33 +07:00
tomas@poseidon.mysql.com
bd49cdd273 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-07 13:44:54 +07:00
knielsen@ymer.(none)
6db8fef5d3 A few minor cleanups for recent AbortOption behaviour change. 2007-02-20 09:52:18 +01:00
mskold/marty@linux.site
8dd443f986 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 11:44:41 +01:00
mskold/marty@linux.site
fd0232b226 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-07 11:40:43 +01:00
mskold/marty@linux.site
5d35ff3da1 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 09:37:18 +01:00
mskold/marty@linux.site
270fd100b7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-07 09:32:34 +01:00
mskold/marty@linux.site
6aee9eedf7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-06 23:48:53 +01:00
mskold/marty@linux.site
b13e5b8ee9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-06 23:42:24 +01:00
tomas@poseidon.mysql.com
3c265e5944 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-05 12:19:24 +07:00
jonas@perch.ndb.mysql.com
0a32761857 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-30 19:45:44 +01:00
jonas@perch.ndb.mysql.com
08d5217056 ndb - interface change of handling of abort option 
1) move AbortOption from NdbTransaction to NdbOperation

2) let each operation have a "default" abort option dependant on
   operation type

   - read - AO_IgnoreError
   - dml - AbortOnError
   - scan take over - AbortOnError

3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.

   Another value to execute(AO) is equivalent to setting AO on each operation before calling execute

4) execute() does _only_ return -1 if transaction has been aborted
   otherwise, you need to check each operation for error code
 2007-01-30 19:45:14 +01:00
jonas@perch.ndb.mysql.com
4ffcd999de Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-30 19:33:33 +01:00
jonas@perch.ndb.mysql.com
7d54ea6b49 ndb - 
remove copy/paste method in NdbIndexOperation
 2007-01-30 19:28:32 +01: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
mskold/marty@mysql.com/linux.site
3c36b92a1d Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName 2007-01-16 09:19:41 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
 2006-12-01 11:35:05 +08:00
stewart@willster.(none)
dd2cea1698 remove OSE 2006-11-03 02:18:45 +11:00
lzhou/root@dev3-138.dev.cn.tlan
b5e13ac17d Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
 2006-11-01 10:53:24 +00: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
jonas@perch.ndb.mysql.com
b0b69bac4a Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-26 16:14:05 +02:00
pekka@orca.ndb.mysql.com
c9e53b3f11 ndb - bug#21690: cleanup: set column properties in any order before create 2006-09-26 14:21:52 +02:00
jonas@perch.ndb.mysql.com
e609add790 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-09-26 13:58:34 +02:00
knielsen@ymer.(none)
273f189971 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu
 2006-09-07 15:25:59 +02:00
knielsen@ymer.(none)
f8f1b203e5 NDB temporary tables. 
Temporary tables are not written to disk by DDL operations. This makes
DDL much faster (useful for tests), but tables are lost after system
restart.

New commit, since this feature will not be available in 5.1.
 2006-09-07 15:09:34 +02:00
mskold/marty@linux.site
04a62eb684 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
6bac3b8f40 NDBAPI cleanup 2006-08-30 11:41:21 +02:00
jonas@perch.ndb.mysql.com
560fc3e3b3 Merge perch.ndb.mysql.com:/home/jonas/src/51-clean 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-17 19:49:00 +02:00
mskold/marty@linux.site
604f3f8a69 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-08-15 14:39:48 +02:00
jonas@perch.ndb.mysql.com
73c58c3234 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-08-14 14:11:51 +02:00
mskold/marty@linux.site
c3da14f4c5 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1-ndb
 2006-08-09 15:02:30 +02:00
jonas@perch.ndb.mysql.com
3a7d3f20f1 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...
 2006-08-09 10:22:09 +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
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
jonas@perch.ndb.mysql.com
b26e651f98 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-06-28 08:47:43 +02:00
tomas@poseidon.ndb.mysql.com
49c8863bbf Bug #19852 Restoring backup made from cluster with full data memory fails 
- post merge fixes for 5.1
 2006-06-27 13:12:34 +02:00