Commit graph

78 commits

Author SHA1 Message Date
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
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
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
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
lenz@mysql.com
2cd30dc674 - a fix for the fix - now "make test" will run the test suite with and
without the PS protocol
2004-12-13 21:43:30 +01:00
mwagner@here.mwagner.org
bde49d08c7 Makefile.am:
s/spaces/TAB/
2004-12-13 14:03:19 -06:00
mwagner@here.mwagner.org
a20c623e6b Makefile.am:
Add running of test suite with --ps-protocol to 'test' target
2004-12-13 13:48:37 -06:00
guilhem@mysql.com
e38dae0bc1 Merge 2004-11-16 00:04:12 +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
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
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
hartmut@mysql.com
5c8eb70667 added --without-man option similar to --without-docs
(part of BUG#5379)
2004-09-26 15:27:13 +02:00
monty@mysql.com
f2829d0386 After merge fixes of merge with 4.1 that included the new arena code.
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions
2004-09-09 06:59:26 +03:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
lenz@mysql.com
1097805cf2 - rename: EXCEPTIONS->EXCEPTIONS-CLIENT 2004-08-05 17:05:11 +02:00
lenz@mysql.com
26f0fdd5e8 - More changes to include the FLOSS License Exception in the
various distributions
2004-08-05 11:22:02 +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
fccfcb98d5 Previous commit didn't make it (tree fix): I'd forgotten semicolon. 2004-06-24 22:47:05 +04:00
konstantin@mysql.com
a32bb3c0c4 Fix of broken 4.1 tree:
Initially my_time.c was added to sql/ link_sources target only.
As it turns out this target is sometimes not called; instead of it
make calls one hard-coded in top-level Makefile.am.
Now adding linking of my_time.c to the top-level Makefile.am
to (hopefully) cover all cases.
2004-06-24 22:33:40 +04:00
konstantin@mysql.com
efba49fd7d Fix for bug in build scripts making everything to be reconfigured
at each 'make' invocation (pushing as two devs tested that the patch is ok).
2004-06-20 03:52:05 +04:00
monty@mysql.com
f693787063 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-05-27 02:51:28 +03:00
monty@mysql.com
833ec1653e netware files should always be in 'make dist'
use opt_net_buffer_length instead of net_buffer_length
2004-05-27 02:47:04 +03:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
serg@serg.mylan
34fdd54e07 post-merge fixes 2003-11-25 20:06:41 +01:00
serg@serg.mylan
bff0bbeb1f merged 2003-11-25 18:26:53 +01:00
lenz@mysql.com
531eb44301 - Removed COPYING.LIB from all source and binary distributions
after it was removed from manual.texi (where it was automatically
   generated from).
2003-11-25 17:52:12 +01:00
lenz@kallisto.local
492ecc54f0 - added missing zlib subdirectory to the source distribution
(crc32.c is included by mysys/my_crc32.c)
2003-09-26 23:57:06 +02:00
lenz@kallisto.local
a7f584da79 - added sql-common subdirectory and sql_common.h to source distribution 2003-06-18 23:13:29 +02:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
hf@deer.mysql.r18.ru
ca02714715 SCRUM
Protocol_cursor class and sql-common/ directory
2003-04-23 19:37:33 +05:00
lenz@mysql.com
faad672620 Distribution cleanups:
- added Dummy file Docs/manual_toc.html to make "make dist" happy if the
   real manual.texi has not been copied into Docs/ (which would make sure
   a "real" manual_toc.html would be created
 - fixed symlinking in the bdb subdirectory (docs are not included anyway)
 - added dist-hook to Makefile.am to remove superfluous SCCS directories
   from the source distribution
2003-04-11 17:07:58 +02:00
lenz@mysql.com
5e3155f1c7 - removed redundant readline_dir from SUBDIRS to fix "make distclean"
(there is a Makefile in readline_topdir that already lists
   readline_dir in SUBDIRS)
2003-03-25 22:48:13 +01:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
monty@mashka.mysql.fi
b14b246d38 Merge with 4.0 to get fix for MIN/MAX 2003-02-07 16:38:37 +02:00
monty@mashka.mysql.fi
564c447b27 Allow 4.0 to read new 4.1 .frm files 2003-02-07 10:35:08 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
lenz@mysql.com
c96a4e7349 - added missing files/directories from bdb and libedit to source distribution
- make sure to not included BK's "SCCS" directories in source distribution
2003-02-03 11:32:29 +01:00
lenz@mysql.com
1e2e4f234f - added netware subdirectory to distribution 2003-01-28 17:49:21 +01:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
monty@mashka.mysql.fi
1bdd1d0626 Merge with 3.23.55 2003-01-25 15:31:07 +02:00
lenz@mysql.com
d372ef4fc5 - reverted previous patch ("make distclean" tried to clean libmysql_r
twice, if --enabable-thread-safe-client is enabled, which broke RPM
   building)
2003-01-23 16:41:26 +01:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
monty@mashka.mysql.fi
f4b950df96 Merge with 3.23 2003-01-16 20:47:46 +02:00
lenz@mysql.com
c0ed25283f - Applied various patches provided by Christian Hammers (MySQL maintainer
for the Debian project) to fix some architecture-specific problems
   and some bugs
2002-12-23 14:36:40 +01:00
lenz@mysql.com
968c2861d4 - Removed MIRRORS from EXTRA_DIST files in Makefile.am to get
"make dist" succeed again.
2002-07-22 14:19:11 +02:00
monty@hundin.mysql.fi
3c5f7494f7 merge to 3.23.51 2002-05-20 12:48:08 +03:00
lenz@mysql.com
bff796ebdc Added os2 source directory to source distribution
(thanks to Yuri Dario <mc6530@mclink.it> for pointing this out)
2002-05-17 12:01:04 +02:00
lenz@mysql.com
0fe3b5afbd Fixed sql_yacc.yy to be compatible with bison 1.31 and above.
Made detection of GNU tar a bit more flexible.
Only use /usr/local/mysql-glibc if it actually exists
2002-05-15 11:06:44 +02:00
lenz@mysql.com
818af46d6c Reworked the RPM spec file and added several fixes to make the
build scripts work again.
2002-05-03 12:31:25 +02:00