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

45897 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@quadxeon.mysql.com
6348d0806c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-28 01:50:16 +02:00
tsmith@quadxeon.mysql.com
5b4264b8fb Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-28 01:37:59 +02:00
tsmith@quadxeon.mysql.com
bfb0448a4d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-28 01:36:09 +02:00
tsmith@quadxeon.mysql.com
33a74e41fc Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-28 01:31:15 +02:00
tsmith@quadxeon.mysql.com
b90b0c7eb2 Bug #27390: mysqld_multi --config-file= not working as documented 
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options.  Treat old --config-file argument as if --defaults-extra-file
had been specified instead.

Plus a few other defaults-related cleanups.
 2007-04-28 01:27:54 +02:00
kaa@polly.local
d4c25d308c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-04-27 15:48:11 +04:00
kaa@polly.local
e8917d0d0f Merge polly.local:/home/kaa/src/maint/bug22364/my51-bug22364 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-04-27 13:06:24 +04:00
kaa@polly.local
d7d0337482 Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364 
into  polly.local:/home/kaa/src/maint/bug22364/my51-bug22364
 2007-04-27 12:42:15 +04:00
tsmith@quadxeon.mysql.com
119ca8702f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-27 00:37:18 +02:00
tsmith@quadxeon.mysql.com
70a742f817 mysql_install_db.sh: Fix algorithm for finding pkgdata directory 2007-04-27 00:35:09 +02:00
tsmith@quadxeon.mysql.com
124f9d5415 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-26 23:07:33 +02:00
tsmith@quadxeon.mysql.com
abcb45d21f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50
 2007-04-26 23:01:04 +02:00
svoj@april.(none)
21087b05d2 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-04-27 01:35:56 +05:00
svoj@april.(none)
640b3e4e74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-04-27 01:33:16 +05:00
svoj@mysql.com/april.(none)
29d2d5dccb Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-04-27 00:58:59 +05:00
svoj@mysql.com/april.(none)
ce55046fbd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-04-27 00:56:50 +05:00
svoj@mysql.com/april.(none)
f698977298 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2007-04-27 00:32:51 +05:00
joerg@trift-lap.fambruehe
044f2e110e Merge trift-lap.fambruehe:/MySQL/M50/push-5.0 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 17:11:33 +02:00
joerg@trift-lap.fambruehe
03f4492b5b Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:48:53 +02:00
joerg@trift-lap.fambruehe
f7bac607cf Merge trift-lap.fambruehe:/MySQL/M50/push-5.0 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:15:52 +02:00
joerg@trift-lap.fambruehe
5af470eef5 Merge trift-lap.fambruehe:/MySQL/M41/push-4.1 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:13:32 +02:00
joerg@trift-lap.fambruehe
69d39592b9 Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1 
into  trift-lap.fambruehe:/MySQL/M41/push-4.1
 2007-04-26 16:09:19 +02:00
joerg@trift-lap.fambruehe
2ed383302f Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:06:44 +02:00
joerg@trift-lap.fambruehe
f723388b18 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:03:02 +02:00
msvensson@pilot.blaudden
27418637d7 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-26 13:58:33 +02:00
msvensson@pilot.blaudden
667cb17942 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-26 13:18:19 +02:00
df@pippilotta.erinye.com
fcea1c66e2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-26 09:38:15 +02:00
df@pippilotta.erinye.com
d384d67af2 Two test cases didn't work without Blackhole compiled into the server. 2007-04-26 08:22:05 +02:00
tsmith@quadxeon.mysql.com
c6f625bdbc Add --symbolic-links=1 for partition_not_windows-master.opt. 2007-04-25 22:55:19 +02:00
df@pippilotta.erinye.com
69395833bc Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-25 21:48:28 +02:00
df@pippilotta.erinye.com
b353df7474 Fix test case that was broken for builds without InnoDB. 
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
---
Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes
 2007-04-25 21:33:18 +02:00
tsmith@quadxeon.mysql.com
da7bda45d6 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-25 20:29:28 +02:00
df@pippilotta.erinye.com
e0f148d5f0 Fix test case that was broken for builds without InnoDB. 2007-04-25 20:23:19 +02:00
tsmith@quadxeon.mysql.com
9e4cc9e393 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-25 20:23:05 +02:00
tsmith@quadxeon.mysql.com
43b4b044f7 Fix for valgrind errors in test: require symlink support for partition_not_windows.test 2007-04-25 20:21:55 +02:00
msvensson@pilot.blaudden
9f1aac76ce Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-25 13:09:26 +02:00
msvensson@pilot.blaudden
b99fbce56e Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-25 12:29:02 +02:00
msvensson@pilot.blaudden
6e4acae645 Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my50-bug25262 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-25 12:08:39 +02:00
mjorgensen@blade09.mysql.com
d343965fcd thread_registry.cc: 
Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed
 2007-04-25 12:08:12 +02:00
msvensson@pilot.blaudden
5fdd4112eb Merge pilot.blaudden:/home/msvensson/mysql/bug25262/my51-bug25262 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-25 11:13:41 +02:00
tsmith@quadxeon.mysql.com
4d34614389 mysql_install_db.sh: 
Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script
 2007-04-25 09:16:38 +02:00
df@pippilotta.erinye.com
0f33daac60 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-04-24 22:45:21 +02:00
df@pippilotta.erinye.com
5ac0fc32b1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-04-24 22:37:33 +02:00
df@pippilotta.erinye.com
6992b90152 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-24 22:34:57 +02:00
df@pippilotta.erinye.com
adf575951b restrict recently added file to GPLv2 2007-04-24 22:33:25 +02:00
iggy@recycle.(none)
08ea692a7f - Resolved conflict between fixes for bugs 25141 and 26074. 
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
 2007-04-24 16:07:52 -04:00
iggy@recycle.(none)
0dfb49b0a6 - Removing mistake. 2007-04-24 14:26:49 -04:00
iggy@recycle.(none)
8e11fe899e Cset exclude: iggy@alf.|ChangeSet|20070330021852|19466 2007-04-24 13:51:59 -04:00
iggy@alf.
b2bf19354c Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_pt
 2007-04-24 12:50:28 -04:00
iggy@alf.
0f43ac0d2a Minor fixes. 2007-04-24 12:41:08 -04:00