cmiller@zippy.cornsilk.net
73e72717e7
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-11 09:01:25 -05:00
cmiller@zippy.cornsilk.net
2cbb366863
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-11 09:01:09 -05:00
cmiller@zippy.cornsilk.net
e0b1e1adcc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860
2006-11-11 08:58:24 -05:00
cmiller@zippy.cornsilk.net
7aa1e7190d
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
2006-11-11 08:57:26 -05:00
cmiller@zippy.cornsilk.net
72dfd02634
Bug #22860 : Option --memlock should be revisited
...
Support says that memlock doesn't work on OSes other than Solaris.
Add a warning about --memlock to the crash monologue.
2006-11-10 16:36:08 -05:00
iggy@rolltop.ignatz42.dyndns.org
3488f21817
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-11-10 15:53:34 -05:00
iggy@rolltop.ignatz42.dyndns.org
b808c8e829
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-11-10 15:52:49 -05:00
iggy@rolltop.ignatz42.dyndns.org
09d305e0b9
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my51-mtr_winfix
2006-11-10 15:50:04 -05:00
iggy@rolltop.ignatz42.dyndns.org
82ad2e5e92
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
2006-11-10 15:49:10 -05:00
iggy@rolltop.ignatz42.dyndns.org
73ff367be3
Test Suite failing on Windows because the $opt_report_features variable was not defined before use.
2006-11-10 15:47:11 -05:00
cmiller@zippy.cornsilk.net
501c11cfc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-10 14:51:01 -05:00
cmiller@zippy.cornsilk.net
03bf5e399c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my51-bug20691
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-10 14:49:43 -05:00
cmiller@zippy.cornsilk.net
d7ef5de57f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-10 14:49:39 -05:00
cmiller@zippy.cornsilk.net
7197da9cc2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-10 14:48:37 -05:00
cmiller@zippy.cornsilk.net
70802780a5
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my51-bug20691
2006-11-10 14:48:07 -05: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
msvensson@neptunus.(none)
59475a119f
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-10 16:20:34 +01:00
msvensson@neptunus.(none)
b693d5fdb3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-10 16:07:49 +01:00
msvensson@neptunus.(none)
b6eef63081
remove remnants of abi-check.ic
2006-11-10 16:07:27 +01:00
msvensson@neptunus.(none)
43ef5e6a0c
Look for "mysqlmanager" also in "bin" directory
...
Improve log message
2006-11-10 15:58:38 +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
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
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@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
cmiller@zippy.cornsilk.net
92e0b31978
Bug#20691: DATETIME col (NOT NULL, NO DEFAULT) may insert garbage when \
...
specifying DEFAULT
This was not specific to datetime. When there is no default value
for a column, and the user inserted DEFAULT, we would write
uninitialized memory to the table.
Now, insist on writing a default value, a zero-ish value, the same
one that comes from inserting NULL into a not-NULL field.
(This is, at best, really strange behavior that comes from allowing
sloppy usage, and serves as a good reason always to run one's server
in a strict SQL mode.)
2006-11-09 18:33:58 -05:00
iggy@rolltop.ignatz42.dyndns.org
5343242c67
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-11-09 15:36:13 -05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
4b823e045f
Fix for bug #23653 : Crash if last_day('0000-00-00')
...
As get_arg0_date() in the Item_func_last_day::get_date() returns
0000-00-00 date sometimes, we have to check ltime->month for 0 after the call.
2006-11-09 16:17:50 +04:00
msvensson@neptunus.(none)
00335aa050
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-09 11:09:41 +01:00
msvensson@neptunus.(none)
9451ba76d8
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-09 11:07:52 +01:00
msvensson@neptunus.(none)
fb25c02b17
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-09 11:01:37 +01:00
msvensson@neptunus.(none)
1ebb9dbd03
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-09 09:49:18 +01:00
msvensson@neptunus.(none)
023c0d03e6
Fix problem when running mysql_client_test in "binary dist", path should include the binary name
2006-11-09 09:48:50 +01:00
msvensson@neptunus.(none)
d9b1f2cfbf
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-09 09:46:35 +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
msvensson@neptunus.(none)
c3a2a93d0f
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-09 00:27:33 +01:00
msvensson@neptunus.(none)
260613fac5
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-09 00:26:49 +01:00