thek@kpdesk.mysql.com
5a10216511
Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010
2007-01-09 12:37:11 +01:00
thek@kpdesk.mysql.com
16590668f1
Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
2007-01-09 12:33:02 +01:00
thek@kpdesk.mysql.com
98a9706edb
Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010
2007-01-09 12:30:57 +01:00
thek@kpdesk.mysql.com
0906993457
Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628
2007-01-09 12:28:46 +01:00
joerg@trift2.
cca28699c8
configure.in : Fix a wrong comment.
2007-01-09 12:21:06 +01:00
evgen@moonbone.local
b6e162c66c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
2007-01-09 13:12:35 +03:00
holyfoot/hf@hfmain.(none)
ae836b4203
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/opt/my51-opt
2007-01-09 12:55:11 +04:00
igor@olga.mysql.com
ae6bee30fc
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24345
2007-01-09 00:17:48 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
5dd6b5a217
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/opt/my50-opt
2007-01-09 11:19:17 +04:00
joerg@trift2.
68d6f7ae52
Changes necessary to build version 4.0.28:
...
- "make_binary_distribution" accepts a dummy "--platform=" argument.
- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.
2007-01-08 18:33:55 +01:00
gkodinov/kgeorge@macbook.local
23acc5b630
mi_check.c:
...
added a missing DBUG_RETURN
2007-01-08 17:27:28 +02:00
mmj@thorsen-consulting.dk
4e0e863a4e
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into thorsen-consulting.dk:/Users/mmj/bktrees/mysql-5.1-build
2007-01-08 12:46:57 +01:00
gkodinov/kgeorge@macbook.local
a30c09c33f
Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt
...
into macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
2007-01-08 12:32:48 +02:00
brian@zim.(none)
05d05c776f
Fix for when shell version of mysql-test-run is called.
2007-01-05 22:28:53 -08:00
brian@zim.(none)
77004aabf2
Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue.
2007-01-05 20:20:53 -08:00
tsmith@siva.hindu.god
eb8cf09388
Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51
...
into siva.hindu.god:/home/tsmith/m/bk/51-build
2007-01-05 16:05:48 -07:00
kent@kent-amd64.(none)
1a0e36ea6d
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644
mysql.spec.sh, make_binary_distribution.sh:
...
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
2007-01-05 16:53:03 +01:00
gkodinov/kgeorge@macbook.gmz
a63df24a68
Bug #15881 : cast problems
...
The optimizer removes expressions from GROUP BY/DISTINCT
if they happen to participate in a <expression> = <const>
predicates of the WHERE clause (the idea being that if
it's always equal to a constant it can't have multiple
values).
However for predicates where the expression and the
constant item are of different result type this is not
valid (e.g. a string column compared to 0).
Fixed by additional check of the result types of the
expression and the constant and if they differ the
expression don't get removed from the group by list.
2007-01-05 14:02:50 +02:00
tsmith@siva.hindu.god
7a2d8c14dd
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
...
Fixes:
- Bug #24712 : SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386 : Performance degradation caused by instrumentation in mutex_struct
- Bug #24190 : many exportable definitions of field_in_record_is_null
- Bug #21468 : InnoDB crash during recovery with corrupted data pages: XA bug?
2007-01-04 19:51:34 -07:00
mmj@tiger.mmj.dk
7e9361a34c
Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
2007-01-04 23:21:44 +01:00
mmj@tiger.mmj.dk
8941159ed8
Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-4.1-build
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
2007-01-04 23:20:04 +01:00
mmj@tiger.mmj.dk
f61a873c60
my_global.h:
...
Patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 23:18:04 +01:00
mmj@tiger.mmj.dk
f0d503a8f2
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
2007-01-04 22:33:34 +01:00
mmj@tiger.mmj.dk
e36b282f1f
Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
2007-01-04 22:24:07 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe
my_global.h:
...
Add patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 22:22:25 +01:00
brian@zim.(none)
c578350e05
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2
The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space).
2007-01-04 11:41:17 -08:00
baker@bk-internal.mysql.com
9ffaf185f0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-04 19:54:52 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
6b3c8dffaf
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/opt/my50-opt
2007-01-04 16:06:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
9aed94aff9
Merge mysql.com:/d2/hf/opt/my41-opt
...
into mysql.com:/d2/hf/opt/my50-opt
2007-01-04 16:05:20 +04:00
brian@zim.(none)
6ff7092698
Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better.
2007-01-03 17:26:45 -08:00
igor@olga.mysql.com
08369f4bce
Fixed bug #24345 .
...
This bug appeared after the patch for bug 21390 that had added some code
to handle outer joins with no matches after substitution of a const
table in an efficient way. That code as it is cannot be applied to the case
of nested outer join operations. Being applied to the queries with
nested outer joins the code can cause crashes or wrong result sets.
The fix blocks row substitution for const inner tables of an outer join
if the inner operand is not a single table.
2007-01-03 12:16:03 -08:00
gkodinov/kgeorge@rakia.gmz
47c044e418
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/work/B15439-5.0-opt
2007-01-03 18:29:39 +02:00
gkodinov/kgeorge@rakia.gmz
770608cf26
sql_udf.cc:
...
Addendum to the fix for bug#15439 : valgrind pb failed
2007-01-03 18:26:39 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
5b1b0a6ff4
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/opt/my41-opt
2007-01-03 11:17:00 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
79361c655a
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/opt/my50-opt
2007-01-03 11:13:01 +04:00
holyfoot/hf@hfmain.(none)
14696a56e2
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2007-01-03 03:36:39 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8c2d34c3c6
merging
2007-01-03 03:35:57 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8ff44eaeef
mysql_upgrade disabled in embedded server
2007-01-03 03:33:26 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
aad2026c2d
ps_not_windows disabled in embedded server
2007-01-03 03:31:12 +04:00
holyfoot/hf@hfmain.(none)
f95e387212
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2007-01-03 02:43:59 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
988e2e4cad
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-03 02:43:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
12cd7c7b3e
warning count for embedded prepared statements added
2007-01-03 02:41:14 +04:00
joerg@trift2.
3883a16af4
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-01-02 19:24:28 +01:00
joerg@trift2.
b8d4d4d382
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-01-02 19:17:19 +01:00
joerg@trift2.
60a3f102a4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/MySQL/M51/mysql-5.1
2007-01-02 17:13:42 +01:00
joerg@trift2.
c445abef91
server-tools/instance-manager/Makefile.am
...
Delete compiler-specific flag setting - it makes builds break.
2007-01-02 17:11:15 +01:00
holyfoot/hf@hfmain.(none)
4c588df26e
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/common/my51-common
2007-01-02 18:02:27 +04:00