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

2959 commits

Author SHA1 Message Date
stewart@mysql.com
cac298e07b Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
 2005-12-28 13:55:59 +11:00
acurtis@xiphis.org
986cd20a0f Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/antony/work2/p4-bug15976
 2005-12-27 11:15:56 -08:00
pekka@mysql.com
79c7b62a55 ndb - post merge fix 2005-12-27 18:47:56 +01:00
acurtis@xiphis.org
9aaa8a81eb Bug#15976: Multiply warnings about unfreed memory 
leaks caused by Archive storage engine not closing files and
  storage engines not receiving panic() during shutdown
 2005-12-25 03:29:49 -08:00
dlenev@mysql.com
15c86158a7 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2005-12-24 20:13:51 +03:00
brian@zim.(none)
795f744c5f Just a few cleanup points in azio. Should solve Ubuntu compile problem. 2005-12-23 17:51:14 -08:00
brian@zim.(none)
a580f985ec Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2005-12-23 12:25:56 -08:00
brian@zim.(none)
56fd453c5d Fix for Antony's push. I've also changed from using the zlib off_t pointer type to my_off_t to fix issues around buggy zlib versions and to make sure file sizes are consistent through out mysql. 2005-12-23 12:22:31 -08:00
joerg@mysql.com
01d0454109 storage/bdb/dist/s_all 
When not generating 'tags' file, also don't generate symlinks to it (or make dist will fail/behave wierdly).
(origin:   1.1985 05/12/22 23:31:15 knielsen@mysql.com +1 -0)
 2005-12-23 12:46:48 +01:00
brian@zim.(none)
f86fd78261 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/archive-5.1
 2005-12-22 20:06:05 -08:00
brian@zim.(none)
3ee76a3e3c Update to add in support for AZIO. 
AZIO differs in that it uses mysys methods and removes all of the malloc calls.
 2005-12-22 19:50:10 -08:00
knielsen@mysql.com
7b8fa1e3c6 Fix compile problem in ha_example.cc 2005-12-22 09:19:24 +01:00
lars@mysql.com
ad126d90e0 WL#1012: All changes as one single changeset. 
This includes both code and test cases.
 2005-12-22 06:39:02 +01:00
acurtis@xiphis.org
0f8f444b8b Change for plugin storage engine to be built after mysqld 2005-12-21 14:58:03 -08:00
acurtis@xiphis.org
e2870b24c6 Fix for plugins work 2005-12-21 14:03:57 -08:00
acurtis@xiphis.org
9e3a6897c9 plugin version changes 2005-12-21 12:50:50 -08:00
acurtis@xiphis.org
9d4d1e81b8 Merge xiphis.org:/home/antony/work2/mysql-5.1 
into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
 2005-12-21 10:26:39 -08:00
acurtis@xiphis.org
13a776778c Finalize storage engine plugins 
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
 2005-12-21 10:18:40 -08:00
vtkachenko@quadxeon.mysql.com
e9282ff3d0 Bug fix for bug #15843 "Added mmap support in myisam creates compile problem 
on AIX 5.2"

Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
removed duplicates

my_sys.h:
  added definition for MAP_NORESERVE
  (for Irix and AIX systems)
sql_map.cc:
  removed definition of MAP_NORESERVE
mi_packrec.c:
  removed definition of MAP_NORESERVE and MMAP_PRIVATE
 2005-12-19 14:16:21 +01:00
joerg@mysql.com
ca033879c9 Merge mysql.com:/M51/try-5.1-extra into mysql.com:/M51/mysql-5.1 2005-12-16 12:47:14 +01:00
joerg@mysql.com
6eb8bf620b storage/innobase/Makefile.am : 
Restore "make dist" for the header files in "storage/innobase/include".
 2005-12-16 12:45:43 +01:00
jonas@perch.ndb.mysql.com
6dc0fbbe39 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 15:07:20 +01:00
knielsen@mysql.com
153ec52f03 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-12-15 09:34:07 +01:00
jonas@perch.ndb.mysql.com
5f032c0eee Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 08:58:39 +01:00
aivanov@mysql.com
c6f658d09e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28
 2005-12-14 18:08:56 +03:00
jonas@perch.ndb.mysql.com
b5b0a3d6ac Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-14 14:03:50 +01:00
knielsen@mysql.com
bf5a72e3f5 Merge mysql.com:/usr/local/mysql/mysql-mawk 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-12-14 13:24:26 +01:00
jonas@perch.ndb.mysql.com
4454e7a631 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-14 11:06:40 +01:00
jonas@perch.ndb.mysql.com
7db9b21297 ndb - merge fix 2005-12-13 19:21:02 +01:00
aivanov@mysql.com
124b76c5a8 Changes from the innodb-5.1-ss28 snapshot. 
Removed include/Makefile.am and the reference to it.
 Deleted db/db0err.h and db directory.
 Check index column sizes in a better way (bug 13315).
 Fixed comments for memory allocation functions and added
 some extra checks. Adapted callers.
 2005-12-13 16:49:24 +03:00
jonas@perch.ndb.mysql.com
1ef416199a Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-13 12:07:36 +01:00
aivanov@mysql.com
141805f9c8 The innodb-5.0-ss52 snapshot changes were erroneously auto-merged 
to 5.1. Undoing the merge.
 2005-12-08 15:00:18 +03:00
jimw@mysql.com
bc4e6f822b Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-06 18:27:39 -08:00
jimw@mysql.com
5dfc1fd5d8 Fix 'make dist' with new bundled BDB 2005-12-06 08:21:15 -08:00
jimw@mysql.com
0c23407a63 Add missing BDB include file 2005-12-05 16:48:09 -08:00
jimw@mysql.com
d6264806b6 Remove generated BDB README file 2005-12-05 16:19:16 -08:00
jimw@mysql.com
786efa8332 Cleanup after import of BDB 2005-12-05 16:03:52 -08:00
jimw@mysql.com
af88d67a19 Import BDB 4.4.16 2005-12-05 10:27:46 -08:00
pekka@mysql.com
b450f94075 ndb - wl#2972 part 1: merge events per event op, gci 2005-12-05 15:20:15 +01:00
jimw@mysql.com
52bb91cceb Merge mysql.com:/home/jimw/my/mysql-5.1-14655 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-02 16:11:04 -08:00
evgen@moonbone.local
f2559fbcc3 Merge moonbone.local:/work/15028-bug-5.0-mysql 
into moonbone.local:/work/15028-bug-5.1-new-mysql
 2005-12-02 22:07:10 +03:00
vtkachenko@quadxeon.mysql.com
c1854e67f0 Merge bk-internal:/home/bk/mysql-5.1-new 
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
 2005-12-02 12:02:38 +01:00
SergeyV@selena.
29941c07ed Merge selena.:H:/MYSQL/bkt/mysql-5.0 
into  selena.:H:/MYSQL/bkt/mysql-5.1
 2005-12-01 23:47:44 +03:00
vtkachenko@quadxeon.mysql.com
045747f23d Many files: 
Added mmap support for MyISAM engine
 2005-12-01 13:34:48 +01:00
stewart@mysql.com
795537d8a3 Sysfile.hpp: 
correct comment for 5.1 sysfile file format
 2005-11-29 08:08:02 +01:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
tomas@poseidon.ndb.mysql.com
a2bb99397d added missing errorcode handling in NdbIndexStat causing test failure 2005-11-24 14:57:14 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
joerg@mysql.com
35735cfefa Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-23 12:34:29 +01:00
tomas@poseidon.ndb.mysql.com
550f675ac6 corrected compile error 
updated listen_event to handle _all_ events
 2005-11-23 12:32:38 +01:00
joerg@mysql.com
415053f2d8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-23 11:53:21 +01:00
tomas@poseidon.ndb.mysql.com
4f9567944c updated ndb listen_event to print more info, and to give immediate respose 2005-11-23 11:53:19 +01:00
joerg@mysql.com
3a7d81258c Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 2005-11-23 11:24:52 +01:00
tomas@poseidon.ndb.mysql.com
6fc48d92bb added ndb testcase WritePartialIgnoreError 
(currently causes nodefailure)
 2005-11-23 10:45:15 +01:00
tomas@poseidon.ndb.mysql.com
a5d6d2bb88 fix error handling if thread creation fails in ndbd 
make sure ndb threads are not started with too small stacksize (which results in default, much too big, stack size to be used)
  moved initialization of ndbd fs block first to ensure that it gets enough space for allocation of file system thread stacks
  changed event buffer reporting in ndb to occur not as often
  corrected the bank application
  corrected output from run-test make-config.sh
 2005-11-22 18:05:10 +01:00
pekka@mysql.com
ce21b10258 ndb - bug#14007 5.1 (merge 5.0->5.1) 2005-11-20 11:15:13 +01:00
guilhem@mysql.com
a7c3aed5f4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
 2005-11-19 13:06:16 +01:00
guilhem@mysql.com
24006266d0 Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
 2005-11-19 10:43:28 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
pekka@mysql.com
7e4641bcea ndb - wl#1497 LinearPool seize_index 2005-11-18 00:09:24 +01:00
pekka@mysql.com
5a6a844fb7 ndb - wl#1497 add LinearPool 2005-11-14 12:03:23 +01:00
pekka@mysql.com
e98fad6bcb ndb - 5.1.2 build fix: Signal syms in test pgms on hp3750 2005-11-11 12:47:10 +01:00
pekka@mysql.com
bffe8fb29d ndb - 5.1.2 build fix: array initializer crashes gcc-2.95.3 2005-11-11 11:36:00 +01:00
joerg@mysql.com
65bea6b36b Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/clone-5.1 2005-11-10 10:05:59 +01:00
tomas@poseidon.ndb.mysql.com
400aa16353 corrected compile error 2005-11-10 09:24:27 +01:00
tomas@poseidon.ndb.mysql.com
d20c1230d8 stilled memleak in ndb Gci_container 2005-11-09 23:08:53 +01:00
joerg@mysql.com
e0a47156ac Compile fix for NDB 5.1.2 on Solaris, provided by Pekka. 2005-11-09 18:36:10 +01:00
joerg@mysql.com
ee3cd794f8 Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-11-09 09:24:16 +01:00
pekka@mysql.com
1926b4e167 ndb - super pool update (future use) 2005-11-08 23:48:26 +01:00
joerg@mysql.com
2153871abf Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
kent@mysql.com
41b554daa9 configure.in: 
Temporary work around to pass --build=... to configure
  in storage engine sub directory
print_file.cpp:
  HP-UX compiler don't like variable shadowing
AsyncFile.cpp:
  Cast result from strstr() to char* for HP-UX compile
trigger_definitions.h:
  "MIN" and "MAX" are not used for trigger stuff, move to a more global include
ndb_global.h.in:
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved here from "include/kernel/trigger_definitions.h".
Makefile.am:
  Add missing ha_* files to EXTRA_mysqld_SOURCES
 2005-11-08 07:41:46 +01:00
jimw@mysql.com
aecf0238f3 Use DB_LOG_AUTOREMOVE flag instead of noticecall customization to BDB 
so log files are deleted once they are no longer in use. (Bug #14655)
 2005-11-07 16:33:53 -08:00
reggie@poseidon.ndb.mysql.com
b272c5b1e5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-07 20:29:58 +01:00
tulin@ndbmaster.mysql.com
01b83def79 corrected compile error in ndb 2005-11-07 16:48:05 +01:00
acurtis@poseidon.ndb.mysql.com
98e20c9b46 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/m51new
 2005-11-07 16:30:03 +01:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
jonas@perch.ndb.mysql.com
b42a1462ea ndb - Fix problematic handling of TUP_ALLOC/DEALLOC REQ wrt varsize 
same row -
      prepare delete, prepare insert (with different size), commit delete, commit insert would lead to assertion
        as prepare insert didnt call handle_size_change_after_update
 2005-11-07 13:28:19 +01:00
jonas@perch.ndb.mysql.com
88fbfc489d Import ndb varsize 2005-11-07 12:19:28 +01:00
kent@mysql.com
3eafcbc234 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-11-06 18:42:27 +01:00
svoj@poseidon.ndb.mysql.com
eed744d30b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2005-11-06 16:16:18 +01:00
kent@mysql.com
99435aa746 NdbIndexStat.cpp, NdbIndexStat.hpp, Suma.hpp portability changes from pekka 2005-11-06 14:12:14 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d WL#2575 - Fulltext: Parser plugin for FTS 
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
 2005-11-06 13:13:06 +01:00
ramil@ndbmaster.mysql.com
bd18c9f24d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new
 2005-11-06 08:30:26 +01:00
ramil@ndbmaster.mysql.com
7678149864 WL #528: Faster free_tmp_table 2005-11-06 08:29:03 +01:00
kent@mysql.com
37788da790 Reapplied portability changes, from changesets by kent, joerg and msvensson 2005-11-06 02:19:51 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
7591d4dc5b ndb - fix conflicting error codes 2005-11-05 22:55:51 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
c69b482102 ndb - test_event 
Fix problem when creating shadow table
 2005-11-05 22:54:25 +01:00
tomas@poseidon.ndb.mysql.com[tomas]
fc90ffc038 ndb - bug with index build of unique index with 32 attributes 
since NDB$FRAGMENT is automatically added, there was a over run in the struct
 2005-11-05 22:50:15 +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
jonas@perch.ndb.mysql.com
3b74bb1b03 ndb - 
Fix uninit variable
 2005-10-11 14:05:13 +02:00
ndbdev@dl145b.mysql.com
147e22650e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-10-10 17:15:25 +02:00
serg@serg.mylan
2e2d18b7cf Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2005-10-09 19:10:19 +02:00
tomas@poseidon.ndb.mysql.com
f22fddd1aa Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2005-10-07 17:44:58 +02:00
tomas@poseidon.ndb.mysql.com
31c276bfff Bug #13610 Assert during sytem restart 
- corrected previous bugfix
 2005-10-07 17:08:59 +02:00
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
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
jimw@mysql.com
4b832c9869 Update ha_berkeley.cc to handle BDB 4.3.28, and re-add two features to 
BDB that we require.
 2005-07-20 18:08:13 -07:00
jimw@mysql.com
d8c0749279 Import BDB 4.3.28 2005-07-20 15:48:22 -07:00
tulin@dl145b.mysql.com
6176a4acf6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 14:48:34 +02:00
tulin@dl145b.mysql.com
bf6e3f9aa8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 07:53:10 +02:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
tomas@poseidon.ndb.mysql.com
0b982e70a1 fixed makefiles in examples to adopt to change in file structure 2005-07-19 01:22:49 +02:00
mronstrom@mysql.com
67087e2aa7 Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +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
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
svoj@mysql.com
e98959dfbe Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/home/svoj/devel/mysql/WL2535-mysql-5.1
 2005-06-28 16:07:16 +05:00
marty@flipper.bredbandsbolaget.se
67c5214ee4 Made upgrade compatibility in 5.1 range to latest build version 2005-06-23 12:16:20 +02:00
ndbdev@dl145b.mysql.com
dcef1c7532 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-22 19:07:29 +02:00
tulin@dl145b.mysql.com
b4f774f62b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-21 15:14:21 +02:00
tulin@dl145b.mysql.com
a6d0581275 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-21 08:49:21 +02:00
tulin@dl145b.mysql.com
566e9ec32a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-21 07:52:33 +02:00
ndbdev@dl145b.mysql.com
8d3a587453 Merge dl145c:tomas/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-17 14:22:33 +02:00
ndbdev@dl145b.mysql.com
dd891e35a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-16 21:39:06 +02:00
ndbdev@dl145b.mysql.com
b6eebbecc2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-16 13:42:15 +02:00
ndbdev@dl145b.mysql.com
a398734315 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-16 12:02:17 +02:00
ndbdev@dl145b.mysql.com
be7c5c1900 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-15 20:07:31 +02:00
ndbdev@dl145b.mysql.com
3e26223773 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-14 10:11:22 +02:00
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30 merge 2005-06-13 08:05:29 +02:00
svoj@mysql.com
1e75a266b3 Merge mysql.com:/mnt/archive/svoj/mysql/mysql-5.1 
into mysql.com:/home/svoj/devel/mysql/WL2535-mysql-5.1
 2005-06-07 21:56:13 +05:00
ndbdev@dl145b.mysql.com
723173c0f3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-07 12:50:45 +02:00
ndbdev@dl145b.mysql.com
2fb1fb5877 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-07 06:50:50 +02:00
ndbdev@dl145b.mysql.com
161a58ab4b merge 2005-06-06 23:39:19 +02:00
tomas@poseidon.ndb.mysql.com
d5e7d650f0 CommandInterpreter.cpp: 
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
 2005-06-02 23:11:54 +02:00
tomas@poseidon.ndb.mysql.com
27b48cbaee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2005-06-02 01:18:03 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
svoj@mysql.com
5193b4ec70 WL#2535 - smarter "index merge" in fulltext 2005-05-27 00:43:40 +05:00
ndbdev@dl145c.mysql.com
30def9f3f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-23 10:45:48 +02:00
ndbdev@dl145c.mysql.com
f0f8b0a97b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-20 06:25:02 +02:00
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
tulin@dl145c.mysql.com
e5976800f7 make dist target fixes 2005-05-16 14:11:42 +02:00
tulin@dl145b.mysql.com
b501f6fa38 conf-daily-sql-ndbmaster.txt: 
Rename: ndb/test/run-test/conf-daily-sql-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
conf-daily-devel-ndbmaster.txt:
  Rename: ndb/test/run-test/conf-daily-devel-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
conf-daily-basic-shark.txt:
  Rename: ndb/test/run-test/conf-daily-basic-shark.txt -> storage/ndb/test/run-test/conf-daily-basic-shark.txt
conf-daily-basic-ndbmaster.txt:
  Rename: ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
conf-daily-basic-dl145a.txt:
  Rename: ndb/test/run-test/conf-daily-basic-dl145a.txt -> storage/ndb/test/run-test/conf-daily-basic-dl145a.txt
 2005-05-13 10:55:12 +02:00
tulin@dl145c.mysql.com
12b4fb158c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-10 20:35:14 +02:00
ndbdev@dl145b.mysql.com
7b7ec96666 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-10 00:45:27 +02:00
ndbdev@dl145b.mysql.com
58aa78e32d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-09 20:28:54 +02:00
lars@mysql.com
e76c641190 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
tulin@dl145b.mysql.com
8aeff7c798 testSuperPool.cpp: 
Rename: ndb/src/kernel/vm/testSuperPool.cpp -> storage/ndb/src/kernel/vm/testSuperPool.cpp
SuperPool.hpp:
  Rename: ndb/src/kernel/vm/SuperPool.hpp -> storage/ndb/src/kernel/vm/SuperPool.hpp
SuperPool.cpp:
  Rename: ndb/src/kernel/vm/SuperPool.cpp -> storage/ndb/src/kernel/vm/SuperPool.cpp
DbtupScan.cpp:
  Rename: ndb/src/kernel/blocks/dbtup/DbtupScan.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
 2005-05-04 15:13:00 +02:00
tulin@dl145b.mysql.com
243e76a1af Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-04 13:33:16 +02:00
tomas@poseidon.ndb.mysql.com
29aa70c5c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-02 13:19:50 +02:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-02 13:18:26 +02:00
brian@zim.(none)
72955bd0e2 Missed a file for storage change (thanks go to Guilhem who noticed it) 2005-04-27 01:32:03 -07:00
brian@zim.(none)
3e4607a3b8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into zim.(none):/home/brian/mysql/mysql-5.1
 2005-04-26 19:07:13 -07:00
brian@zim.(none)
2193fd8666 All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
brian@zim.(none)
2a7c71e309 Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00