Commit graph

3411 commits

Author SHA1 Message Date
pekka@mysql.com
2bd00bc2d4 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2005-12-28 11:09:06 +01:00
stewart@mysql.com
70cc1a08af build fixes for azio on systems without zutil.h 2005-12-28 15:33:48 +11:00
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