mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50346 commits 2781 branches 343 tags 1.6 GiB
Commit graph

229 commits

Author SHA1 Message Date
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
 2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
tsmith/tim@siva.hindu.god
50e372d608 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
 2006-12-08 16:39:58 -07:00
tsmith/tim@siva.hindu.god
d54c696c24 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
 2006-12-08 16:26:41 -07:00
tsmith/tim@siva.hindu.god
a58d08513b Makefile.am 
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets
 2006-12-08 16:17:46 -07:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
33c248eee5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-04 19:06:42 +01:00
kent@kent-amd64.(none)
2b5e2230bb Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-02 23:22:53 +01:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f mysql_install_db.sh: 
If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
 2006-12-02 23:16:47 +01:00
df@kahlann.erinye.com
4e76f699b2 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-01 10:20:23 +01:00
monty@narttu.mysql.fi
2e8d2e3ef9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-29 22:54:11 +02:00
monty@mysql.com/narttu.mysql.fi
23263db66e Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations 
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
 2006-11-29 22:51:09 +02:00
kent@kent-amd64.(none)
4ed32e0448 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 20:25:20 +01:00
kent@mysql.com/kent-amd64.(none)
cae575a390 Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-11-29 20:24:41 +01:00
kent@mysql.com/kent-amd64.(none)
3643b3689f Makefile.am: 
Remove soft links before creating source TAR, to avoid file copies (bug#11865)
 2006-11-29 20:22:58 +01:00
kent@kent-amd64.(none)
e5ebcd1653 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 19:42:19 +01:00
kent@mysql.com/kent-amd64.(none)
c048bf11ab Makefile.am: 
Corrected change to create "win" directory
 2006-11-29 19:41:48 +01:00
kent@kent-amd64.(none)
ffe9fcf123 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 19:37:59 +01:00
kent@mysql.com/kent-amd64.(none)
43eba545f3 Makefile.am: 
"make distcheck" fix, "win" directory
 2006-11-29 19:35:40 +01:00
msvensson@neptunus.(none)
cc747a02b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 21:11:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
gkodinov/kgeorge@macbook.gmz
de08856720 fix for the merge of --mem support in autopush.pl in 5.1-opt 2006-11-20 13:42:22 +02:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
 2006-11-17 10:30:16 +04:00
holyfoot/hf@mysql.com/deer.(none)
e7cde72651 merging 2006-11-16 23:00:48 +04:00
msvensson@neptunus.(none)
0b60b7d59a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 19:19:02 +01:00
msvensson@neptunus.(none)
e09df84aa5 Remove test-force-pl-mem and add test-force-mem 2006-11-13 19:16:23 +01:00
gkodinov/kgeorge@macbook.gmz
eb1a8fcd3c Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.1-opt
 2006-11-09 12:27:53 +02:00
gkodinov/kgeorge@macbook.gmz
1a8204f242 Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt
 2006-11-08 16:41:12 +02:00
gkodinov/kgeorge@macbook.gmz
c7866bd569 Make a new test target for autopush.pl to run memory based tests 2006-11-08 15:15:56 +02:00
msvensson@shellback.(none)
f60e544902 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-14 17:31:04 +02:00
msvensson@neptunus.(none)
3eaeeca6de Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
 2006-10-06 01:00:35 +02:00
msvensson@neptunus.(none)
15ffeaa093 Add target to Makefile which uses the much faster --mem switch to mysql-test-run.pl 2006-10-05 23:19:32 +02:00
scottlee@calico.site
3eaee36070 Back port change from 5.1 that adds the Windows database files to the source package. 
This is needed for WiX pacakging.
 2006-10-02 23:05:52 -04:00
guilhem@gbichot3.local
09c5a83416 WL#3504 "plugin actions for engines' and plugins' unit tests" 
for push in 5.1 (I will inform Trudy).
Storage engines and plugins can now have unit tests to test their components; such
test must be an executable C/C++ program which name ends with '-t' and which is
obeys the mytap protocol, it must be stored in the storage engine's or plugin's
source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
this.
The top-level Makefile target "test-unit" will run all unit tests: it will scan
the engines' and plugins' directories, recursively, and execute all executable
files which name ends with '-t'."
 2006-09-15 15:15:24 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-11 13:34:44 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
ebaaee05e1 WL#3368 mixed format as default 
Two minor fixes:
 1. to make make test executes with mixed;
 2. proper isolation of binlog_statement_insert_delayed 
    from others through reset master cleaning up binlog
    todo: adapt this technique to other restarting for binlog tests
 2006-08-30 21:43:05 +03:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files: 
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
 2006-08-21 15:34:29 +02:00
serg@serg.mylan
25d0962cbe change test targets to be more modular. include unit tests into make test 2006-06-14 09:12:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
serg@sergbook.mysql.com
506f9800bd fixes 2006-04-30 15:52:30 -04:00
acurtis@xiphis.org
53d4594cfe Merge xiphis.org:/home/antony/work2/wl3201.3 
into  xiphis.org:/home/antony/work2/wl3201.merge
 2006-04-24 13:36:15 -07:00
acurtis@xiphis.org
4e11a4d941 WL#3201 
" Configure support for server plugins "
 2006-04-13 13:49:29 -07:00
jimw@mysql.com
66c29e0f49 Merge mysql.com:/home/jimw/my/mysql-5.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
 2006-04-13 10:37:57 -07:00
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