holyfoot/hf@mysql.com/hfmain.(none)
3ff9dff06a
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/mr10/my50-mr10
2007-01-11 13:18:49 +04:00
igor@olga.mysql.com
61cd864bc0
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-10 08:55:55 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
27d56afcfc
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mr10/my50-mr10
2007-01-10 20:37:22 +04:00
kent@mysql.com/kent-amd64.(none)
1768b21a14
configure.in:
...
Removed line accidently inserted when correcting bug#18526
2007-01-10 14:50:09 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
bcd4d84de9
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/mr10/my50-mr10
2007-01-10 14:33:34 +04:00
gluh@mysql.com/eagle.(none)
4a3fe2b682
after merge fix
2007-01-10 14:03:36 +04:00
gluh@mysql.com/eagle.(none)
9da22c73d0
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-01-10 13:04:58 +04:00
gluh@mysql.com/eagle.(none)
b61f3545f5
Fix for bug#20867 InnoDB Bug - create temporary table+crash => mysqld needs to clean up
...
2nd version
During tmp tables cleanup we get the handler for temporary table
and delete table using handler method.
2007-01-10 12:57:03 +04:00
igor@olga.mysql.com
578fae9dc8
Fixed bug #25427 .
...
In the method Item_field::fix_fields we try to resolve the name of
the field against the names of the aliases that occur in the select
list. This is done by a call of the function find_item_in_list.
When this function finds several occurrences of the field name
it sends an error message to the error queue and returns 0.
Yet the code did not take into account that find_item_in_list
could return 0 and tried to dereference the returned value.
2007-01-10 00:27:11 -08:00
igor@olga.mysql.com
add0ab219d
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-09 17:31:14 -08:00
joerg@trift2.
b63c167f66
support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build.
2007-01-10 00:36:41 +01:00
evgen@moonbone.local
e098f736e1
Fixed bug#16861: User defined variable can have a wrong value if a tmp table was
...
used.
The Item::save_in_field() function is called from fill_record() to fill the
new row with data while execution of the CREATE TABLE ... SELECT statement.
Item::save_in_field() calls val_xxx() methods in order to get values.
val_xxx() methods do not take into account the result field. Due to this
Item_func_set_user_var::val_xxx() methods returns values from the original
table, not from the temporary one.
The save_in_field() member function is added to the Item_func_set_user_var
class. It detects whether the result field should be used and properly updates
the value of the user variable.
2007-01-09 23:24:56 +03:00
igor@olga.mysql.com
ebc68a176c
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-09 12:07:13 -08:00
evgen@moonbone.local
ac48c8bae1
Bug#14171: Wrong internal default value for a BINARY field.
...
A BINARY field is represented by the Field_string class. The space character
is used as the filler for unused characters in such a field. But a BINARY field
should use \x00 instead.
Field_string:reset() now detects whether the current field is a BINARY one
and if so uses the \x00 character as a default value filler.
2007-01-09 22:35:30 +03:00
evgen@moonbone.local
fe30a0959c
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 22:14:11 +03:00
igor@olga.mysql.com
5cd4ba4e0b
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25027
2007-01-09 10:26:28 -08:00
thek@kpdesk.mysql.com
2af1ec2911
Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-build
2007-01-09 14:35:16 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
0fa12d2491
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/opt/my50-opt
2007-01-09 15:37:31 +04: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
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
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
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
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
37ae5bbbbe
my_global.h:
...
Add patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 22:22:25 +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
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@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)
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
holyfoot/hf@mysql.com/hfmain.(none)
a44106c07c
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 18:00:30 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
429b82bed3
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 17:54:38 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e7130631cb
merging fix
2007-01-02 17:53:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
56155d83e7
merging fix
2007-01-02 17:51:32 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
726a51bc77
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 17:50:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
998167acce
embedded-server related fixes
2007-01-02 17:46:20 +04:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba
view.result:
...
Temporary work around for bug#25359
2007-01-02 11:01:48 +01:00
kent@mysql.com/kent-amd64.(none)
769e177090
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 10:51:44 +01:00