Commit graph

237 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
a923367f59 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-13 07:50:46 +01:00
pekka@mysql.com
495ad63420 ndb - mysql-5.1-wl2325-v7 quick fix 2006-01-13 00:22:16 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
jonas@perch.ndb.mysql.com
9e35866aa6 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-12 17:04:57 +01:00
jonas@perch.ndb.mysql.com
4d7cfa322b Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-01-12 16:59:27 +01:00
jonas@perch.ndb.mysql.com
fc59260f8f ndb -
Fix partial SR
2006-01-12 16:58:41 +01:00
pekka@mysql.com
3bf2255400 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-12 16:43:51 +01:00
pekka@mysql.com
f71e3d631c ndb - wl#2972 tiny bugfix 2006-01-12 16:34:57 +01:00
knielsen@mysql.com
e533cfe6f6 Sun compiler fixes. 2006-01-12 15:40:38 +01:00
jonas@perch.ndb.mysql.com
619ca4176b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-12 11:31:51 +01:00
jonas@perch.ndb.mysql.com
c505553bd9 ndb_dd_ddl - fix bug 2006-01-12 11:30:17 +01:00
jonas@perch.ndb.mysql.com
6a0eac8418 ndb -
fix Suma get buffer ptr, adopt to new page pool in tup
2006-01-12 10:48:36 +01:00
pekka@mysql.com
7219ad013e Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-12 00:17:11 +01:00
pekka@mysql.com
cf3a6863e4 ndb - wl#2972 (5.1, related) detached trigger fixes for multiops 2006-01-11 23:51:18 +01:00
knielsen@mysql.com
aaca50207d Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 13:06:20 +01:00
jonas@perch.ndb.mysql.com
b2d5ea4676 Fix handlerton alter_tablespace for example storage engine 2006-01-11 12:39:09 +01:00
jonas@perch.ndb.mysql.com
161645c81e wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
knielsen@mysql.com
adce077dfb Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 09:21:11 +01:00
pekka@mysql.com
1c599c8eeb Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-09 01:19:37 +01:00
knielsen@mysql.com
46772f0c2f Some header files were missing from "make dist". 2006-01-05 14:17:05 +01:00
pekka@mysql.com
a2d7ec08f0 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-02 09:58:59 +01:00
knielsen@mysql.com
dca88abf12 Do not use C++ style comments (//) in C source (breaks compilation on aix52). 2006-01-02 09:58:58 +01:00
knielsen@mysql.com
62d6f430ee Do not use C++ style comments (//) in C source (breaks compilation on aix52). 2006-01-02 02:45:26 +01:00
pekka@mysql.com
afbbaa9794 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/export/space/pekka/ndb/version/my51
2006-01-01 21:50:29 +01:00
pekka@mysql.com
e469d5fc85 ndb - wl#2972 (5.1) fix detached trigger opType 2006-01-01 21:48:26 +01:00
bar@mysql.com
6ff211329f WL#1324 table name to file name encoding
- Encoding itself, implemented as a charset
  "filename". Originally planned to use '.'
  as an escape character, but now changed to '@'
  for two reasons: "ls" does not return
  file names starting with '.' considering them
  as a kind of hidden files; some platforms
  do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
  strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
  an extention rather that replace it.
- Replacing all numeric constants in fn_format
  flag arguments to their mysys definitions, e.g.
  MY_UNPACK_FILENAME,
- Predictability in several function/methods:
  when a table name can appear with or withot .frm
  extension. Some functions/methods were changed
  so accept names strictly with .frm, other - strictly
  without .frm extensions. Several DBUG_ASSERTs were
  added to check whether an extension is passed.
Many files:
  table name to file name encoding
mysql_priv.h:
  Prototypes for new table name encoding tools.
ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
row0mysql.c:
  Fixing table name prefix.
mf_format.c:
  Adding MY_APPEND_EXT processing.
Many files:
  Fixing tests.
my_sys.h:
  Adding new flag to append rather than replace an extension.
m_ctype.h:
  Adding "filename" charset definition.
2005-12-31 09:01:26 +04:00
svoj@mysql.com
a3f445151f WL#2575 - Fulltext: Parser plugin for FTS
Manual merge.
2005-12-28 16:05:30 +04:00
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