mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43886 commits 2781 branches 343 tags 1.6 GiB
Commit graph

184 commits

Author SHA1 Message Date
jimw@mysql.com
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained 
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
 2006-04-13 10:34:46 -07:00
mats@mysql.com
d05769e126 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/bkroot/mysql-5.1-new
 2006-04-13 17:48:53 +02:00
mats@mysql.com
0bd7349557 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/merge-mysql-5.1-wl3206
 2006-04-13 13:25:58 +02:00
serg@serg.mylan
d65ccb4493 merged 2006-04-13 10:24:44 +02:00
serg@serg.mylan
601d707661 Auto merged 2006-04-12 14:14:03 +02:00
serg@serg.mylan
70c2ff34f7 fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new, 
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
 2006-04-11 18:54:24 -07:00
msvensson@neptunus.(none)
8fe764fbb2 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-11 09:11:36 +02:00
brian@zim.(none)
eaf850ef5b Drop a number of OS2 specific files. 2006-04-10 17:48:19 -07:00
msvensson@neptunus.(none)
e805afde11 Step 1 in removing mysql-test-run.sh from 5.1 and up 2006-04-10 18:08:54 +02:00
mats@mysql.com
32c697806f WL#3206 (Adding unit tests): 
Moving mytap library into unittest/
Adding 'test' target to make and run unit tests.
Minor fixes.
 2006-04-06 17:18:12 +02:00
mats@mysql.com
9b087e7d45 WL#3206 (Adding unit tests): 
Added missing mytap/t/Makefile.am and minor fix to Makefile.am
 2006-04-05 09:02:36 +02:00
mats@mysql.com
02ffd18af6 WL#3206 (Add unit tests): 
An implementation of the TAP framework for writing unit tests.
 2006-04-04 18:16:15 +02:00
knielsen@mysql.com
ce4463a139 Add some stuff to source package needed for CMake Windows packaging. 2006-03-30 11:02:52 +02:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from 
a normal 'make dist' source .tar.gz.
 2006-03-24 22:50:56 +01:00
svoj@mysql.com
a3f445151f WL#2575 - Fulltext: Parser plugin for FTS 
Manual merge.
 2005-12-28 16:05:30 +04: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
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
jani@ua141d10.elisa.omakaista.fi
3d7d8af3aa Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-11-03 15:01:04 +02:00
jani@ua141d10.elisa.omakaista.fi
b8248334d9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-11-03 13:02:05 +02:00
jani@ua141d10.elisa.omakaista.fi
8243eee9db Added test-force to Makefile. 2005-11-03 11:47:54 +02:00
kent@mysql.com
3e62fcf2a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-25 03:00:09 +02:00
kent@mysql.com
6a5a451cfb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-25 02:36:51 +02:00
kent@mysql.com
257b17ba2f Makefile.am: 
Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num
 2005-10-25 02:27:55 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
kent@mysql.com
3b906e73d8 portability.h: 
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets
 2005-09-29 19:37:03 +02:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 11:34:53 +02:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in: 
Enable "make distcheck" to work
 2005-09-24 15:51:45 +02:00
kent@mysql.com
0cfed79ea5 Makefile.am: 
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
 2005-09-24 02:42:38 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02:00
lars@mysql.com
5fe6cbf771 Removed redundant case in Makefile.am 2005-09-02 12:20:18 +02:00
joerg@mysql.com
54e797a27d Manual merge. 2005-09-01 21:06:37 +02:00
brian@zim.(none)
57403ddc9d Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
 2005-08-30 14:40:02 -07:00
kent@mysql.com
c019e40ff0 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-28 20:21:47 +02:00
kent@mysql.com
88af3ceb20 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-08-28 20:03:03 +02:00
kent@mysql.com
e2954b29a1 Makefile.am: 
Make ports configurable from environment for test
 2005-08-28 19:46:56 +02:00
joerg@mysql.com
d8a1c90597 Correct a typing error: Missing ".pl" suffix is essential. 2005-08-25 11:17:54 +02:00
joerg@mysql.com
c5e51b7c27 Add the "test-force" target to "Makefile.am". 2005-08-23 19:16:43 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
kent@mysql.com
eaec18bda6 Makefile.am: 
Bug#9873, reenabled --without-man option to work
 2005-06-28 04:49:03 +02:00
lenz@mysql.com
5d515df476 - reverted to using the shell version of mysql-test-run for "make test" until the 
remaining bugs in the Perl version have been resolved
 2005-06-23 19:03:55 +02:00
tulin@dl145b.mysql.com
27cdade716 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-20 14:24:13 +02:00
kent@mysql.com
43f8b7b43b Merge 2005-06-20 13:20:27 +02:00
kent@mysql.com
27e9a70379 Makefile.am: 
Use the Perl version of mysql-test-run
 2005-06-20 12:58:58 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
lenz@mysql.com
8e09a3b8d1 - fixed the "test-force" target in the toplevel Makefile.am for systems on which 
"." is not in the PATH...
 2005-05-27 19:20:29 +02:00
tulin@dl145c.mysql.com
e5976800f7 make dist target fixes 2005-05-16 14:11:42 +02:00
serg@serg.mylan
530b6ba541 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-01 23:10:55 +02:00
monty@mysql.com
e721ec37ff After merge fixes 2005-04-30 18:40:08 +03:00
svoj@mysql.com
c1fd1d6a5b WL#2286 Compile MySQL w/YASSL support 
yaSSL-0.9.7 library bundled.
 2005-04-28 18:23:27 +05:00
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