Commit graph

41541 commits

Author SHA1 Message Date
gluh@eagle.(none)
215d3da7d2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-11 18:15:40 +04:00
gluh@mysql.com/eagle.(none)
63e5959202 after merge fix 2007-01-11 16:50:34 +04:00
holyfoot/hf@hfmain.(none)
5565157ba0 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/d2/hf/mr10/my51-mr10
2007-01-11 13:21:28 +04:00
holyfoot/hf@deer.(none)
814c1308ea Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 18:33:28 +04:00
holyfoot/hf@deer.(none)
ebc89b9816 Merge mysql.com:/home/hf/work/24502/my51-24502
into  mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 16:23:54 +04:00
holyfoot/hf@deer.(none)
743beccf87 Merge mysql.com:/home/hf/work/22451/my51-22451
into  mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 16:22:47 +04:00
holyfoot/hf@hfmain.(none)
93a7321d45 Merge mysql.com:/d2/hf/common/my51-common
into  mysql.com:/d2/hf/mr10/my51-mr10
2007-01-10 14:34:28 +04:00
gluh@eagle.(none)
42e49682b7 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-10 14:14:22 +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
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
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
gluh@mysql.com/eagle.(none)
91d75da75e Fix for bug#25026 information_schema.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME returns garbage
Unencode internal db & table name
2007-01-09 18:14:04 +04: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
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
gkodinov/kgeorge@macbook.local
23acc5b630 mi_check.c:
added a missing DBUG_RETURN
2007-01-08 17:27:28 +02: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
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
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.
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
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