Commit graph

24 commits

Author SHA1 Message Date
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
c3e20d907e 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-04 11:42:50 +02:00
gni/root@dev3-127.(none)
c26952192b BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains 
           "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
2006-09-22 20:22:50 +08:00
jonas@perch.ndb.mysql.com
64bf33836e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-09-15 11:43:49 +02:00
dli@dev3-76.dev.cn.tlan
ac481a3206 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
2006-09-01 10:36:32 +08:00
stewart@mysql.com
9edd7b3766 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
2006-06-20 17:33:14 +10:00
jonas@perch.ndb.mysql.com
98e8749ef3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-05-19 10:36:19 +02:00
jani@ua141d10.elisa.omakaista.fi
083f8455c7 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-09 20:50:29 +03:00
jonas@perch.ndb.mysql.com
59bced7f8a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-26 15:16:21 +02:00
tomas@poseidon.ndb.mysql.com
fe67d648fc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 14:00:44 +02:00
mskold@mysql.com
27a2d1b68b Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 12:10:09 +02:00
monty@mysql.com
cbd420a0c1 Remove compiler warnings
Add missing DBUG_RETURN
Fixed stack overflow in NdbBlob (found by ndb_gis.test)
Fixed access to freed memory in ndb_cluster_real_free_share()
2006-03-29 17:04:00 +03:00
jonas@perch.ndb.mysql.com
4a22082b66 ndb -
more compiler warnings...
2006-03-24 10:23:50 +01:00
jonas@perch.ndb.mysql.com
31efa863dd ndb -
still some compiler warnings
2006-03-24 10:19:10 +01:00
stewart@mysql.com
05696de46f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-02-16 15:51:37 +11:00
jonas@perch.ndb.mysql.com
d033448fa1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-13 09:22:02 +01:00
jonas@perch.ndb.mysql.com
161645c81e wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
jonas@perch.ndb.mysql.com
88fbfc489d Import ndb varsize 2005-11-07 12:19:28 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
tulin@dl145c.mysql.com
a29132cdc5 Merge 2005-09-12 14:22:06 +02:00
ndbdev@dl145c.mysql.com
86344c4a83 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-06 09:21:23 +02:00
tomas@poseidon.ndb.mysql.com
911d878ca9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
tulin@dl145b.mysql.com
6a0a577335 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-08 17:12:09 +02:00
brian@zim.(none)
2a7c71e309 Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00