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
serg@serg.mylan
13ecd69469
avoid functions in configure
2004-07-27 09:12:20 +02:00
lenz@mysql.com
6c8641c1cc
- typo fix: protocoll -> protocol
2004-07-26 12:32:04 +02:00
konstantin@mysql.com
569d3c8488
WL#1518, "make bundled zlib usable for unix builds":
...
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts
like AIX52 or HPUX11, where such a check is possible. It didn't compile
there before as these systems dont't have installed zlib, so nothing got broken ;)
2004-07-24 03:30:11 -07:00
konstantin@mysql.com
076156cc86
A small fix to let building of debug versions on HP-UX11
2004-07-23 20:28:54 -07:00
konstantin@mysql.com
4139c359f8
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
...
Use of acconfig.h is deprecated in modern autotools (a cleaner patch).
2004-07-23 18:52:25 -07:00
serg@serg.mylan
a0bae8eb8b
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-07-23 19:41:19 +02:00
serg@serg.mylan
a4ae8c3c8d
workaround for Sun Forte / x86
...
BUG#4681
2004-07-23 19:12:20 +02:00
lenz@mysql.com
a54f6398fe
- Use the same compile options for the upcoming darwin8 OS in
...
configure.in (thanks to Al Begley from Apple for the hint)
2004-07-23 12:27:28 +02:00
paul@ice.snake.net
fb7f15188a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-02 17:32:47 -05:00
bar@mysql.com
a597b077c6
configure.in:
...
armscii8_bin was referenced to as armscii_bin.
2004-07-02 13:33:26 +05:00
paul@ice.snake.net
f5decb3d1c
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-01 12:01:26 -05:00
lenz@mysql.com
2c6537e2cb
- tagged ChangeSet 1.2023 as "mysql-4.1.3"
...
- bumped up version number in configure.in: 4.1.3-beta -> 4.1.4-beta
2004-07-01 14:41:51 +02:00
paul@ice.snake.net
f5f335aa68
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-28 23:30:37 -05:00
monty@mysql.com
39a3c4deda
Merge with 4.0
2004-06-27 19:17:24 +03:00
monty@mysql.com
380ff9c228
Fix to be able to cross-compile for modesto
2004-06-27 18:20:06 +03:00
paul@ice.snake.net
3029ae651d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-23 18:11:09 -05:00
serg@serg.mylan
2c48e052d9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-23 21:47:07 +02:00
paul@ice.snake.net
fe310f9e59
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-23 10:44:54 -05:00
bar@mysql.com
6515bb716b
configure.in:
...
--with-charset=binary didn't really work after my previous change.
2004-06-23 19:13:27 +05:00
serg@serg.mylan
c03addab79
merged
2004-06-23 12:36:07 +02:00
paul@ice.snake.net
317524ce02
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-22 10:12:15 -05:00
bar@mysql.com
e6fbd80922
configure.in:
...
./configure --with-charset=binary
is now possible.
2004-06-22 16:03:25 +05:00
paul@ice.snake.net
e39ff18e65
configure.in:
...
Fix typo.
2004-06-18 12:14:27 -05:00
bar@deer.(none)
24751bf332
configure.in:
...
New collations were added.
2004-06-18 12:09:21 +05:00
tomas@poseidon.bredbandsbolaget.se
51602e0fb9
hpux compile fixes
2004-06-17 21:06:21 +00:00
serg@sergbook.mysql.com
e70b330f69
don't bother creating Makefiles that are not needed
2004-06-16 15:13:17 +03:00
tomas@poseidon.ndb.mysql.com
e23f736d85
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-06-15 11:30:00 +00:00
tomas@poseidon.bredbandsbolaget.se
1395781ed1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-15 06:39:58 +00:00
tomas@mc05.(none)
8278d71688
ndb fixes for make dist
2004-06-15 08:14:20 +02:00
joreland@mysql.com
2f629a3151
Remove docs from make for now.
...
Plan is to introduce --flag, but Tomas will do that later.
2004-06-14 09:53:59 +02:00
tomas@poseidon.bredbandsbolaget.se
41a758c973
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
2004-06-11 23:39:10 +00:00
serg@serg.mylan
035e03c1f6
merged
2004-06-11 20:55:08 +02:00
tomas@poseidon.bredbandsbolaget.se
b34697a243
fix for ndb compile problem on non gcc
2004-06-11 09:39:20 +00:00
tomas@mc05.(none)
52143c65bb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1
2004-06-07 17:58:35 +02:00
brian@brian-akers-computer.local
e24e1350a3
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-05 10:43:22 -07:00
serg@serg.mylan
033dd6f839
do not create ndb Makefiles unless required
2004-06-05 09:22:11 +02:00
tomas@mc05.(none)
5a8303a3c1
moved ndb versioning to configure and fixed ndb docs make
2004-06-04 16:08:50 +02:00
tomas@poseidon.ndb.mysql.com
df84c09341
automake ndb docs make
2004-06-04 14:08:16 +00:00
tomas@poseidon.ndb.mysql.com
d4960b81ac
ndb make updates
2004-06-03 18:25:46 +00:00
tomas@mc05.(none)
bf644e1785
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-03 13:15:55 +02:00
autotest@mc01.ndb.mysql.com
63fe3c7e73
Makefile.am:
...
local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
NDB_DEBUG -> VM_TRACE
configure.in:
cleaned up ndb CXX flags and added optional flag possibility
2004-06-03 13:15:54 +02:00
tomas@poseidon.bredbandsbolaget.se
d369c2f241
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-02 00:56:59 +00:00
tomas@poseidon.bredbandsbolaget.se
8d7d4c077b
several ndb make changes, see respective file
2004-06-02 00:54:58 +00:00
monty@mysql.com
70c2256d2f
Merge with 4.0 to get fixes for netware
2004-06-02 00:09:14 +03:00
tomas@mc05.(none)
4971ce3ec2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-01 22:39:40 +02:00
monty@mysql.com
5b905beee1
Updated version number
...
Portability fix for netware. (We can't use TRY_RUN when cross compiling)
2004-06-01 23:34:47 +03:00
monty@mysql.com
197fcf1ee4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-01 22:30:03 +03:00
monty@mysql.com
017096695a
Update version number
...
Fixed serbian error messages
Fix for windows regarding changed variable name
2004-06-01 22:29:46 +03:00
hf@deer.(none)
39f69a2126
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-06-01 22:37:39 +05:00
tomas@mc05.(none)
308f40bb98
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-01 18:05:43 +02:00
tomas@poseidon.ndb.mysql.com
f265403fb7
various ndb make changes, see respective file
2004-06-01 11:19:40 +00:00
konstantin@mysql.com
0dde8d4ae7
AC_MAINTAINER_MODE removed: now MySQL is always configured in maintainer
...
mode and one should expect better dependencies tracking.
2004-05-31 17:02:18 +04:00
tomas@poseidon.bredbandsbolaget.se
26df6c6fc1
added shared mem + sci options for ndb
2004-05-28 09:22:27 +00:00
monty@mysql.com
aabbacba8f
New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGS
2004-05-28 10:41:38 +03:00
joreland@mysql.com
58240397a5
Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
2004-05-28 07:08:15 +02:00
joreland@mysql.com
7a5024b613
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-05-28 07:04:07 +02:00
tomas@mc05.(none)
d1467d7a42
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-05-28 03:24:29 +02:00
monty@mysql.com
be7f1a3570
merge with 4.0 to get fix for hpux
2004-05-28 02:04:07 +03:00
monty@mysql.com
33dcccb5bf
Portability fix for HPUX
2004-05-28 02:00:34 +03:00
joreland@mysql.com
eff14ee4fe
Use ndbclient more
2004-05-27 21:03:05 +02:00
joreland@mysql.com
3becb6ef05
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
2004-05-27 19:58:19 +02:00
tomas@poseidon.(none)
12709128d5
ndb fixes see files
2004-05-27 16:28:41 +00:00