Commit graph

563 commits

Author SHA1 Message Date
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
tomas@poseidon.ndb.mysql.com
250d643ee2 last try didnt work 2004-10-05 07:48:51 +00:00
tomas@poseidon.ndb.mysql.com
c36637a96e bumped up version to 3.5.2
removed staus flag
2004-10-05 06:49:11 +00:00
hartmut@mysql.com
5c8eb70667 added --without-man option similar to --without-docs
(part of BUG#5379)
2004-09-26 15:27:13 +02:00
tomas@poseidon.ndb.mysql.com
0273e84b7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-24 11:07:55 +00:00
lenz@mysql.com
9329bc36d9 - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
label for now)
 - tagged ChangeSet 1.2015.1.10 as "mysql-4.1.5"
2004-09-21 08:58:44 +02:00
mysql@mc04.(none)
d905188230 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
2004-09-16 09:21:49 +02:00
mikael@mc04.(none)
72017f8dd2 logging_ok:
Logging to logging@openlogging.org accepted
SCI_Transporter.hpp, SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
TCP_Transporter.hpp, TCP_Transporter.cpp:
  Added DBUG statements
SHM_Transporter.hpp, SHM_Transporter.cpp:
  Fixed SHM Transporter
SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
IPCConfig.cpp:
  Fixed up config of SCI
SocketServer.cpp:
  Added DBUG support for SocketServer threads
ConfigInfo.cpp:
  Config changes for SCI
TransporterDefinitions.hpp, mgmapi_config_parameters.h:
  SCI fixes
Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
configure.in:
  Fixed small bug with shared mem and sci together in configure
acinclude.m4:
  Added possibility of providing SCI library path in confgure
2004-09-15 20:41:49 +02:00
konstantin@mysql.com
da7dbde8f4 Fix warnings reported by aclocal > 1.8 (Underquoted definition of ...) 2004-09-15 02:15:11 +04:00
bar@mysql.com
134b5c7d75 Persian collation, contibuted by Jody McIntyre 2004-09-13 12:07:01 +05:00
tomas@poseidon.(none)
cf3cb70d30 configure.in:
bumped up version to 3.5.1
2004-09-10 17:29:10 +00:00
matt@mysql.com
c998fbdb8c configure.in:
Updated to 4.0.22
2004-09-10 00:08:12 +02:00
joreland@mysql.com
aa4402dd80 merge 2004-09-06 07:43:31 +02:00
vva@eagle.mysql.r18.ru
c3cb5980c2 define macro "DEFINE_ALL_CHARACTER_SETS" in the configure.in completely 2004-09-04 00:28:48 +05:00
vva@eagle.mysql.r18.ru
15eb33ab44 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-09-03 19:32:18 +05:00
vva@eagle.mysql.r18.ru
0fda2f6b97 1. discarded term.h from the distribution
2. changed key_* to el_ley_* in the libedit key.h
   (because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c 
   (if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in 
   (now we don't include term.h in the el.h at all)
2004-09-03 17:47:36 +05:00
joerg@mysql.com
9e2e71816f Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"
(backport from 4.1).
2004-09-01 12:36:01 +02:00
joreland@mysql.com
e148567003 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-01 04:55:16 +02:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
lenz@mysql.com
87cbc358e9 - bumped up version number in configure.in to "4.1.5-gamma"
- tagged ChangeSet@1.2013 as "mysql-4.1.4"
2004-08-31 15:53:26 +02:00
vva@eagle.mysql.r18.ru
e022b3144e Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-08-31 18:53:24 +05:00
vva@eagle.mysql.r18.ru
53b804a679 fixed two compiling bugs for libedit 2004-08-31 18:29:01 +05:00
joerg@mysql.com
124f5be301 Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES". 2004-08-30 13:25:22 +02:00
bar@mysql.com
cb9591b7de configure.in:
Ascii was written twice
2004-08-30 11:36:26 +05:00
bar@mysql.com
4d1dedd70d Compile all charset conversion tables if --with-extra-charsets=all
or --with-extra-charsets=complex is given.
2004-08-27 21:17:29 +05:00
tomas@poseidon.(none)
c16f134be3 Merge 2004-08-24 22:35:14 +00:00
vva@eagle.mysql.r18.ru
0e52a45838 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear
2004-08-25 01:02:07 +05:00
joreland@mysql.com
7a3d0c83fa Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-24 21:07:08 +02:00
vva@eagle.mysql.r18.ru
b20161b841 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2
2004-08-24 23:38:31 +05:00
vva@eagle.mysql.r18.ru
24b7ad8229 fixed AC_DEFINE's for libedit-2.6.7 2004-08-24 23:32:58 +05:00
vva@eagle.mysql.r18.ru
3988677b15 added skipped macro for new libedit-2.6.7 in configure.in 2004-08-24 21:01:11 +05:00
vva@eagle.mysql.r18.ru
3e6d1022d6 upgrade to libedit-2.6.7
(fixed Bug #4462 libedit compile failure)
2004-08-24 20:41:41 +05:00
vva@eagle.mysql.r18.ru
f6a3f2cfad fixed :
Bug #3937  	fails to compile with both gcc 3.3.3/icc8
Bug #4728  	mysql couldn't be compiled using system readline (readline-4.3)
2004-08-24 19:23:23 +05:00
joreland@mysql.com
6163efe1ac merge 2004-08-24 13:29:11 +02:00
brian@avenger.(none)
32f2674a07 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/mysql/4.1
2004-08-23 12:31:03 -07:00
brian@avenger.(none)
e4a2cdde47 Changing version information. 2004-08-23 12:28:28 -07:00
tomas@poseidon.(none)
c3f2f7426c further simplifications of ndb config and aligned usage of mysql datadir in ndb 2004-08-23 16:29:04 +00:00
serg@serg.mylan
157a041baa bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
fix for bdb not ending up into libmysqld.a
2004-08-23 13:55:40 +02:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
brian@avenger.(none)
b7b48d6764 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1
2004-08-13 16:27:17 -07:00
lenz@mysql.com
586e5af9e7 - manual merge 2004-08-13 16:25:23 +02:00
guilhem@mysql.com
c9a46a43d2 Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix 
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...
2004-08-13 15:29:47 +02:00
brian@avenger.(none)
1fe8b35bba This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file. 2004-08-12 20:57:18 -07:00
lenz@mysql.com
b1f5aa0094 - portability fix for SCO Open Server 5.0.7 (thanks to Boyd Gerber) 2004-08-12 21:55:05 +02:00
lenz@mysql.com
c8f8ca889f - giving a range does not work for platform detection in configure.in
- resorting to having to separate sections for darwin7 and darwin8
2004-08-12 21:15:49 +02:00
bar@mysql.com
e4348ee9a5 configure.in:
Collation name fixes.
2004-08-09 13:04:34 +05:00
ndbdev@eel.hemma.oreland.se
8e74c1b78c Merge 2004-08-05 22:32:25 +02:00
joreland@mysql.com
b1fd4d8839 wl2010
Added NDB_DEBUG(--with-debug) and NDB_DEBUG_FULL(--with-debug=full)
2004-08-05 12:54:59 +02:00
joreland@mysql.com
a2f866e909 Fix ndb detection of gcc 2004-08-02 13:44:22 +02:00
konstantin@mysql.com
b14b00249f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-zlib
2004-07-27 10:05:56 -07:00