mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40074 commits 2776 branches 343 tags 1.6 GiB
Commit graph

40074 commits

This branch
This branch
All branches
Author SHA1 Message Date
baker@bk-internal.mysql.com
52e03bac84 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-11 02:25:40 +01:00
brian@zim.(none)
b46c727a66 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-11-10 17:25:39 -08:00
brian@zim.(none)
739f2c27d0 This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :) 2006-11-10 17:21:59 -08:00
joerg@trift2.
ca06382435 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-10 20:02:33 +01:00
tsmith@quadxeon.mysql.com
ce805aff3f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-10 19:41:47 +01:00
tsmith@quadxeon.mysql.com
82b6712a27 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-10 19:39:26 +01:00
tsmith@quadxeon.mysql.com
b2da711fbf Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-10 19:38:07 +01:00
joerg@trift2.
e47f753a85 Merge trift2.:/MySQL/M50/bug24023-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:11:26 +01:00
joerg@trift2.
32d9fdaa98 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:07:52 +01:00
joerg@trift2.
743ab0c6a4 Merge trift2.:/MySQL/M41/bug17194-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:54:58 +01:00
joerg@trift2.
2ab3d0bfb4 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:52:53 +01:00
df@kahlann.erinye.com
a185c4f6ea Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
 2006-11-10 14:49:07 +01:00
df@kahlann.erinye.com
403ecf18c6 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 14:44:01 +01:00
df@kahlann.erinye.com
abd8eeaaa7 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51
 2006-11-10 13:27:50 +01:00
df@kahlann.erinye.com
59e33edf22 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
f1764fa99f add --report-features to mysql-test-run.pl 2006-11-10 13:12:08 +01:00
petr/cps@outpost.site
e06f74f9f9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
 2006-11-10 15:05:38 +03:00
ted@ted.mysql.internal
1c8a6cfc37 Merge ted.mysql.internal:/home/ted/src/mysql/50-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-11-10 07:23:42 +03:00
ted@ted.mysql.internal
bc9ca699fb Memory allocation bug fixed 2006-11-10 07:21:10 +03:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef9f68a7c9 Merge mysql.com:/Users/kent/mysql/bk/lic/my51-lic 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-11-10 02:45:34 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
040f95494d Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic
 2006-11-10 02:36:29 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
54f6fc07b9 Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-10 02:35:01 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
264beeff86 Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
 2006-11-10 02:28:31 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f893128839 mysql-test-run.sh: 
Added --force-restart pseudo server argument to shell version as well
 2006-11-10 02:22:33 +01:00
joerg@trift2.
dce6efd035 mysql-test/install_test_db.sh 
Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.
 2006-11-09 17:43:31 +01:00
tsmith@quadxeon.mysql.com
8f92859ec6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51
 2006-11-09 07:56:25 +01:00
tsmith@quadxeon.mysql.com
03d07ea337 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51
 2006-11-09 05:25:45 +01:00
tsmith@quadxeon.mysql.com
e9b42a4b27 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
 2006-11-09 05:21:56 +01:00
tsmith@quadxeon.mysql.com
c2aca91b7f This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33 
Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()
 2006-11-09 05:03:35 +01:00
tsmith@quadxeon.mysql.com
f1e0cf9d28 This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 
Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #23769: Debug assertion failure with innodb_locks_unsafe_for_binlog
- Bug #24089: Race condition in fil_flush_file_spaces()
 2006-11-09 05:02:37 +01:00
tsmith@quadxeon.mysql.com
18080530d7 Applied innodb-5.1-ss1004 
Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #24089: Race condition in fil_flush_file_spaces()
 2006-11-09 05:01:19 +01:00
tsmith@quadxeon.mysql.com
a77dde8635 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-09 00:54:21 +01:00
tsmith@quadxeon.mysql.com
41117b1226 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-09 00:53:22 +01:00
tsmith@quadxeon.mysql.com
246ec19117 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
 2006-11-09 00:47:48 +01:00
tsmith@quadxeon.mysql.com
a7b142446f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-09 00:38:34 +01:00
tsmith@quadxeon.mysql.com
9e3e6a7c0b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-09 00:28:31 +01:00
tsmith@quadxeon.mysql.com
f663ba45e5 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-09 00:26:22 +01:00
msvensson@neptunus.(none)
d18ee2dee7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-09 00:17:52 +01:00
msvensson@neptunus.(none)
f032a223b7 Fix warnings and NetWare compile failure 2006-11-09 00:17:22 +01:00
msvensson@neptunus.(none)
feba324016 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-08 23:24:43 +01:00
msvensson@neptunus.(none)
0ec6432636 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 23:24:16 +01:00
msvensson@neptunus.(none)
b4f20c56c7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-08 23:19:28 +01:00
msvensson@neptunus.(none)
a620a3abd1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 23:17:09 +01:00
msvensson@neptunus.(none)
90d8d7b5cf Update of --mem flag after comments 2006-11-08 23:16:44 +01:00
msvensson@neptunus.(none)
174bfe9dd6 No need to pass an additional arg to to mtr_add_arg when there is no % sign 2006-11-08 22:56:06 +01:00
msvensson@neptunus.(none)
4dfbc712ed Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 22:54:22 +01:00
msvensson@neptunus.(none)
1437500c1b Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 2006-11-08 22:53:40 +01:00
msvensson@neptunus.(none)
34f2c99dfc Don't run mysqltest with both --silent and --verbose 2006-11-08 22:45:52 +01:00
joerg@trift2.
82f33033c3 Merge trift2.:/MySQL/M41/bug24023-4.1 
into  trift2.:/MySQL/M50/bug24023-5.0
 2006-11-08 21:46:28 +01:00
joerg@trift2.
31bd60a3a7 Merge trift2.:/MySQL/M41/bug24023-4.1 
into  trift2.:/MySQL/M41/clone-4.1
 2006-11-08 21:27:58 +01:00