mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
58227 commits 2788 branches 343 tags 1.7 GiB
Commit graph

3150 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
35a520d2c2 merge error 2005-09-15 12:53:59 +02:00
tomas@poseidon.ndb.mysql.com[tomas]
8069a6833a ndb-wl2325.patch 2005-09-15 11:33:50 +02:00
msvensson@neptunus.(none)
10eee79363 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-15 11:32:49 +02:00
pekka@mysql.com
81d8cc1e84 ndb - wl#2624 re-commit due to bk problem 2005-09-15 02:33:28 +02:00
tulin@dl145c.mysql.com
ea4161baed merge 2005-09-14 17:58:20 +02:00
msvensson@neptunus.(none)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
 2005-09-14 09:43:56 +02:00
jonas@eel.(none)
183aab9d22 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-13 14:03:00 +02:00
ndbdev@dl145c.mysql.com
4e8595862d Merge 2005-09-13 05:33:11 +02:00
tulin@dl145c.mysql.com
a29132cdc5 Merge 2005-09-12 14:22:06 +02:00
jonas@eel.(none)
8583963bf6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-10 21:06:22 +02:00
tulin@dl145b.mysql.com
b1994c03b6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-10 09:04:34 +02:00
jonas@eel.(none)
b5954b69a0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 21:05:59 +02:00
tulin@dl145b.mysql.com
8445a0756b SignalSender.cpp: 
Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp
SignalSender.hpp:
  Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp
 2005-09-09 20:37:14 +02:00
ndbdev@dl145b.mysql.com
46cc62e216 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-09 15:26:47 +02:00
jonas@eel.(none)
5fa930ad2d 5.0->5.1 merge fix 
5.1 has moved ndb into storage
 2005-09-09 13:44:48 +02:00
jonas@eel.(none)
315b8ef3bb Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 13:30:38 +02:00
jonas@eel.(none)
ae690c7f48 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-09 13:27:59 +02:00
osku@127.(none)
89e8df28ec Merge 127.(none):/home/osku/mysql/5.0/12084 
into  127.(none):/home/osku/mysql/5.1/clean
 2005-09-08 11:36:11 +03:00
jonas@eel.(none)
e615b5cc99 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-06 12:50:30 +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
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02:00
jonas@eel.(none)
2575f62b85 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-09-06 06:52:06 +02:00
msvensson@neptunus.(none)
345dfef41f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-02 08:59:59 +02:00
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02:00
jonas@eel.(none)
0b23e8a891 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  eel.(none):/home/jonas/src/mysql-5.1-push
 2005-08-27 07:42:59 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
94c2b5ff73 Merge fixes 2005-08-25 14:52:21 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-25 13:11:38 -04:00
joreland@mysql.com
f6ac0351da Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/jonas/src/mysql-5.1-push
 2005-08-08 22:21:43 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
db8e0b7306 Fixed ndb_config problems with merge 2005-08-05 18:45:03 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-05 18:01:34 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4954b60037 Fix bug introduced, attempted an optimisation not very successfully 2005-07-27 13:18:30 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
f7f01ba630 Fixes 2005-07-27 11:26:37 -04:00
mronstrom@mysql.com[mikron]
68fb6faa41 wl2405.patch 2005-07-26 17:12:05 +02:00
joreland@mysql.com
543f95ecba ndb - 
fix length of NDB$PK in unique index table
 2005-07-26 15:05:05 +02:00
joreland@mysql.com
14fb5e3c63 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.1-push
 2005-07-25 10:18:15 +02:00
tulin@dl145b.mysql.com
8cea968418 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-22 23:15:51 +02:00
tulin@dl145b.mysql.com
80c269f3f5 corrected errorcodes to be in right range 2005-07-22 23:15:45 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
bb51c4f510 Fixed error codes 2005-07-22 17:12:51 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
2061b38e64 Bug #12114 patch 2005-07-22 16:39:05 -04:00
ndbdev@dl145b.mysql.com
1dd2efba70 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-22 15:16:37 +02:00
ndbdev@dl145b.mysql.com
c3b9a42abd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-22 15:01:11 +02:00
ndbdev@dl145b.mysql.com
5712bf6dea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-22 14:50:19 +02:00
ndbdev@dl145b.mysql.com
e6d3d73ce0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-22 13:53:59 +02:00
mronstrom@mysql.com
fdb645d187 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/Users/mikron/mysql-5.1
 2005-07-22 12:15:03 +02:00
mronstrom@mysql.com
9203d3559d Fixed error in constants 2005-07-22 10:57:36 +02:00
jimw@mysql.com
a9700e643e Merge mysql.com:/home/jimw/my/mysql-5.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-bdb
 2005-07-21 18:04:55 -07:00
ndbdev@dl145b.mysql.com
e4c53b737e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-22 02:56:25 +02:00
ndbdev@dl145b.mysql.com
f5f56e4995 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-21 16:49:03 +02:00
mronstrom@mysql.com
b25cbdba14 Fixed test cases for hash and linear hash and fixed guess in NDB API 
for this as well
 2005-07-21 14:56:07 +02:00
ndbdev@dl145b.mysql.com
d931417cc3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-21 12:50:24 +02:00