Commit graph

677 commits

Author SHA1 Message Date
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
tomas@poseidon.ndb.mysql.com
93f9641412 configure.in:
updated ndb version number
2005-01-03 11:03:50 +01:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00
joerg@mysql.com
df1c8a1f2e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-12-30 16:44:50 +01:00
joerg@mysql.com
8311f83f06 Clean up the handling of "server" and "client" directories, while still avoiding the double listing of
common directories in 'SUBDIRS' macro ("make distclean" had failed due to that).
Solves bug#7368: "regex make error in 4.1.8"
2004-12-30 14:03:19 +01:00
lenz@mysql.com
9682485c1e - make sure that MYSQL_VERSION_ID created by "configure" does not contain any
non-numerical characters (if $VERSION was e.g. "4.1.8a", $MYSQL_VERSION_ID
  resulted in "40108a", which broke the build as MYSQL_VERSION_ID must be
  numerical)
2004-12-27 18:15:32 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
tomas@poseidon.ndb.mysql.com
7d5e413f62 automatically configure with shared memory transporter for ndb if functions are available 2004-12-20 16:19:22 +01:00
kaa@polly.local
4644e54f8f Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0
2004-12-17 17:31:16 +03:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
joreland@mysql.com
9395fa2942 Bumb up ndb version 2004-12-17 06:55:21 +01:00
lenz@mysql.com
b9c549ae39 - bumped up version number in configure.in from 4.1.8 to 4.1.9
- tagged ChangeSet 1.2173 as "mysql-4.1.8"
2004-12-16 13:34:25 +01:00
kaa@polly.local
2ce0ad6d7e Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0 2004-12-14 22:26:31 +03:00
patg@patrick-galbraiths-computer.local
301c493252 First commit to mysql-5.0 tree to include MySQL Federated Storage Handler. This includes both the source and header files, test (results, test, require), and modifications to server and handler base files, and autoconf modifications to properly build federated handler. 2004-12-11 12:03:51 -08:00
monty@mysql.com
aa2f116110 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-07 15:47:34 +02:00
brian@avenger.(none)
2bf9291b0c Removed the need for our own sanity check file (which was just the default anyways). 2004-12-06 10:04:16 -08:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
joreland@mysql.com
50e15affff Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl1744
2004-12-06 14:52:31 +01:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
tomas@poseidon.ndb.mysql.com
4753641048 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-06 08:54:53 +00:00
tomas@poseidon.ndb.mysql.com
b44ab76554 wixed ndb-debug option for configure 2004-12-06 08:49:34 +00:00
bar@mysql.com
6ad58765b7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-12-06 10:58:40 +04:00
bar@mysql.com
86013091ca configure.in:
latin1_spanish_ci produced unknown collation error.
2004-12-06 10:57:22 +04:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
brian@avenger.(none)
20c18c77e1 Fixing problem with case insitive file systems.
Would you believe that I wrote all of this on a Mac? I just happen to be not using HFS for the partition I did this work on. Oops :)
2004-12-04 11:00:33 -08:00
tomas@poseidon.ndb.mysql.com
ee3953c5c1 added configure option to control extra ndb debug options,
for release debug build please configure with --without-ndb-debug
2004-12-03 21:26:14 +00:00
brian@avenger.(none)
c783380701 Resolving conflict. 2004-12-02 19:00:33 -08:00
brian@avenger.(none)
3854c5087b Syntax fix, plus an update for version. 2004-12-02 18:53:49 -08:00
joerg@mysql.com
9150971bac Change to prevent the failure of "make distclean" on the missing 'regex/Makefile' (and, later, 'strings/Makefile'). 2004-12-02 16:42:37 +01:00
mwagner@mysql.com
d6efb4bbfd configure.in:
Incremented for next version
2004-12-02 07:24:08 +01:00
brian@avenger.(none)
5d8a33e0ed First revision of changes to clean up acinclude and configure.in. Removed all AC_DEFUN out to separate m4 files, removed rule concerning building the website, and updated SANITY rule with the latest from 1.8. 2004-12-01 17:02:22 -08:00
serg@serg.mylan
b460059988 merged 2004-11-28 20:42:04 +01:00
kent@mysql.com
77c32ac173 configure.in:
A work-around for SCO, disable use of clock_gettime
2004-11-28 15:45:12 +01:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
tomas@poseidon.ndb.mysql.com
3f36910639 fix for mysqladmin link problem
.c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin
2004-11-18 20:28:36 +00:00
serg@serg.mylan
431b93609c #warning removed
AC_FUNC_MMAP changes to AC_CHECK_FUNCS(mmap)
2004-11-17 14:38:01 +01:00
serg@serg.mylan
60e3e821c6 don't delete ac_available_languages_fragment in configure - it may be needed later 2004-11-16 16:52:29 +01:00
joreland@mysql.com
6b2b1b8e81 merge 2004-11-16 07:22:30 +01:00
guilhem@mysql.com
e38dae0bc1 Merge 2004-11-16 00:04:12 +01:00
serg@serg.mylan
87840e841c Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 19:27:06 +01:00
tomas@poseidon.ndb.mysql.com
16e34bd27d changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
added libs variable for ndbmgmclient used by mysqladmin
    add linkage with @ndb_mgmclient_libs@
    additional options for ndbcluster
    added support for managing the cluster to mysqladmin
    added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
    use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
2004-11-15 12:40:32 +00:00
joreland@mysql.com
f63b126f7e Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-15 10:50:58 +01:00
tomas@poseidon.ndb.mysql.com
0d55af3f0e moved ndb_restore together with rest of the ndb tools
kernel includes needed by ndb_restore
    changed link order
    moved LocalConfig to mgmapi
    Moved NdbConfig to Portlib
    mgmapi to use LocalConfig for connectstring parsing instead of it's own
    enable usage of "NULL" connectstring for default
    new ndbmgmclient lib that can be used by e.g. mysqladmin later
    LocalConfig no longer needed here, now in mgmapi
    Send connectstring to mgmapi instead
    added valid connectstring to be with only host without port i.e.
    valid connectstring =host1,host2,host3
    default port will be added
2004-11-14 11:02:06 +00:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
joreland@mysql.com
64f7965d80 wl1744 - ndb win port
improve ndb_global.h
2004-11-11 22:39:24 +01:00
serg@serg.mylan
aafb2cf6a3 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-11 13:44:10 +01:00
joreland@mysql.com
02209bb010 wl1744- ndb windows
move ports into ndb_global
2004-11-11 08:15:52 +01:00
joreland@mysql.com
b2ff852c62 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-10 21:53:21 +01:00