mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34933 commits 2784 branches 343 tags 1.6 GiB
Commit graph

494 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
eb135547eb Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-26 14:56:23 +01:00
msvensson@pilot.blaudden
23b6b4a565 Only allow a version number to be read from "/etc/debian_version" 2007-02-26 14:52:51 +01:00
msvensson@pilot.blaudden
b57994a7c2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:23:27 +01:00
msvensson@neptunus.(none)
8931166e55 Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
 2007-02-16 15:19:38 +01:00
msvensson@pilot.mysql.com
24a242bee1 Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4 Bug#18628 mysql-test-run: security problem(part1) 
- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl
 2007-02-14 14:44:34 +01:00
msvensson@pilot.mysql.com
b6bd53aa9d Correct the non working check for --skip-log-bin in "extra_opt" 2007-02-06 16:38:32 +01:00
msvensson@pilot.mysql.com
61686e8556 Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-06 14:30:23 +01:00
msvensson@pilot.mysql.com
958308a5cf Bug#24805 mtr.pl can't handle test with --disable-log-bin 
- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test
 2007-02-06 14:19:07 +01:00
cmiller@zippy.cornsilk.net
a795b7097f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:23:05 -05:00
df@kahlann.erinye.com
c5de0332e1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-22 16:39:40 +01:00
df@kahlann.erinye.com
c124372550 after-merge fix 2007-01-22 16:32:57 +01:00
df@kahlann.erinye.com
58bf072264 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-22 16:30:53 +01:00
knielsen@ymer.(none)
854ef6b0a3 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint 
into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
 2007-01-22 08:59:26 +01:00
knielsen@ymer.(none)
ba6e6d0754 Implement mysql-test-run.pl option to limit the number of saved core 
files. This helps stability of multiple parallel automated test runs,
avoiding the situation where one bad build fills up disk with 1000s of
core files, causing failures in other test runs.
 2007-01-19 09:41:08 +01:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:43:44 -05:00
tsmith@siva.hindu.god
bac65ee90a WL #3670: Compile-time option to remove GRANT-related startup options 
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
  --bootstrap
  --init-file
  --skip-grant-tables

Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.

For example:

$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
 2007-01-09 19:22:01 -07:00
tsmith/tim@siva.hindu.god
bb108f57c1 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-22 13:41:10 -07:00
msvensson@pilot.mysql.com
b28e8faf23 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2006-12-22 10:00:12 +01:00
msvensson@pilot.mysql.com
73d82523a3 Set default number of masters to 1 2006-12-22 09:59:41 +01:00
tsmith/tim@siva.hindu.god
f204db4dd1 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-21 18:20:09 -07:00
msvensson@neptunus.(none)
fe0a11d194 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-20 23:59:34 +01:00
msvensson@neptunus.(none)
da6773f97b Count number of masters the test is actually using and only start as 
many as neeeded
 2006-12-20 23:44:53 +01:00
msvensson@neptunus.(none)
5ccd3608d5 When running with --valgrind and --debug send all the output from 
mysqld and valgrind to tracefile.
 2006-12-20 16:54:37 +01:00
msvensson@neptunus.(none)
be0368c230 Add possibility to activate --mark-progress of mysqltest 2006-12-20 16:53:06 +01:00
df@kahlann.erinye.com
5ad288f18b Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-18 13:44:57 +01:00
df@kahlann.erinye.com
4a98f36e59 Use a temporary directory for sockets if the socket path becomes too long. 2006-12-18 13:44:21 +01:00
msvensson@neptunus.(none)
fdbc84d27c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 12:33:44 +01:00
msvensson@neptunus.(none)
ba6d2bbf64 Pass --no-defaults to embedded server to avoid that it reads any defaults file 2006-12-11 12:16:20 +01: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
df@kahlann.erinye.com
9a6f9c8c44 late after-merge fix 2006-11-30 22:45:55 +01:00
msvensson@neptunus.(none)
e36384fdce Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 12:14:28 +01:00
msvensson@neptunus.(none)
fb2ffbf203 Merge neptunus.(none):/home/msvensson/mysql/bug10608/my41-bug10608 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-30 11:58:23 +01:00
msvensson@neptunus.(none)
eea2bd8421 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-29 22:51:25 +01:00
msvensson@neptunus.(none)
b23cb23349 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-29 22:50:10 +01:00
msvensson@neptunus.(none)
9799bbd76f Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-29 22:49:31 +01:00
msvensson@neptunus.(none)
5f4acf145b After 5.1.6 just turn on logging, it will be sent to tables by default 2006-11-29 22:49:02 +01:00
df@kahlann.erinye.com
756f104591 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-29 10:33:23 +01:00
df@kahlann.erinye.com
c134b8c332 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-29 10:22:43 +01:00
df@kahlann.erinye.com
1c46f7d841 minor fix 2006-11-29 10:21:59 +01:00
msvensson@neptunus.(none)
3a50528940 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 23:12:22 +01:00
msvensson@neptunus.(none)
2b98e19bb5 Remove the moved check a second time. 2006-11-28 23:09:17 +01:00
msvensson@neptunus.(none)
6dd62468bd Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 23:07:02 +01:00
msvensson@neptunus.(none)
7eb487ab26 Move the check that $opt_vardir could be created and was writable to the function 
where we know how to creat the vardir 
Remove unused variable
 2006-11-28 23:06:06 +01:00
msvensson@neptunus.(none)
bb0d7ed44b Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 22:17:26 +01:00
msvensson@neptunus.(none)
9235e363a3 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 22:16:52 +01:00
msvensson@neptunus.(none)
05eb532514 Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows 
- Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features
 2006-11-28 22:16:31 +01:00
msvensson@neptunus.(none)
0c48000e6c Fix missing parameter declaration 2006-11-28 21:57:42 +01:00