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

115 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
2afe5e9b53 merge 2005-10-07 09:29:55 +02:00
tomas@poseidon.ndb.mysql.com
e72fdf5619 Merge 2005-10-07 01:12:46 +02:00
jonas@perch.ndb.mysql.com
3703570c9c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
 2005-10-06 12:47:41 +02:00
tomas@poseidon.ndb.mysql.com
411559c270 merge 2005-10-06 12:45:30 +02:00
jonas@perch.ndb.mysql.com
50f92f2f76 bug#13610 - ndb 
incorrectly computed m_gcp_complete_rep for partial start
  gives assert in debug mode, and error in ndbapi in release
 2005-10-06 11:20:19 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
jimw@mysql.com
dcd8b9a503 Add files for bdb/build_win64, and tweak the configuration to skip over 
parts of the library we have omitted.
 2005-09-22 16:42:39 -07:00
jimw@mysql.com
b75cc41b7b Remove some files that should not have been added with BDB upgrade, 
and update ignore file after move of storage engines to storage/.
 2005-09-22 15:53:18 -07:00
jimw@mysql.com
936755b7ee Merge mysql.com:/home/jimw/my/mysql-5.1-bdb 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-09-21 10:35:19 -07:00
pekka@mysql.com
a1ac019f4c ndb - backport from 5.1-ndb-dd: AttributeHeader: store size in bytes 2005-09-20 12:24:16 +02:00
tulin@dl145c.mysql.com
f32ba4f82a added missing hpp file for install/dist 2005-09-20 08:35:57 +02:00
msvensson@neptunus.(none)
441c70cd9c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-15 14:19:56 +02:00
tomas@poseidon.ndb.mysql.com
e7e414cded Makefile: 
new file
 2005-09-15 14:19:55 +02:00
tomas@poseidon.ndb.mysql.com
dfde70f52e merge 2005-09-15 13:07:22 +02:00
tomas@poseidon.ndb.mysql.com
a90c4441de .del-readme.txt~b8bfcc7df24862f9: 
Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
.del-ndbapi_async.cpp~319189569fb659ec:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
.del-Makefile~79de1c081ceb33e9:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
.del-Makefile~75b59c8ae729df88:
  Delete: storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
.del-ndbapi_event.cpp~c5d949802966180:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
.del-Makefile~9b32217af2a3145:
  Delete: storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
.del-Makefile~39711027c2d962ff:
  Delete: storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
.del-Makefile~27fcbb1f51b14aa7:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
.del-readme.txt~c54f2dc2297fa97:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
.del-Makefile~896f3a0fcdc499eb:
  Delete: storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
.del-Makefile~2bb0971c2e0576ef:
  Delete: storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
.del-Makefile~8c7f0da8e0e08db6:
  Delete: storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
 2005-09-15 13:00:53 +02:00
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