Commits · 6d7e9bcc20c97a2e89b653d9a8ff6d58cdffe2f7 · Kirill Smelkov / mariadb

11 Mar, 2007 3 commits

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 6d7e9bcc
unknown authored Mar 11, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt


sql/sql_yacc.yy:
  Auto merged
```
6d7e9bcc

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 00a18149

unknown authored Mar 11, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt


sql/item.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

00a18149

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 05c534be

unknown authored Mar 11, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.0-opt-merge-5.1-opt


mysql-test/r/func_str.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

05c534be

10 Mar, 2007 5 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a140cb7

unknown authored Mar 11, 2007

into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt


mysql-test/r/explain.result:
  Auto merged
mysql-test/r/func_default.result:
  Auto merged
mysql-test/r/func_regexp.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/func_str.result:
  Manually merged
mysql-test/t/func_str.test:
  Manually merged

8a140cb7

Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql · 2f774b47

unknown authored Mar 10, 2007

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged

2f774b47

Bug#15757: Wrong SUBSTRING() result when a tmp table was employed. · 816ea8a3

unknown authored Mar 10, 2007

When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.

Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.


mysql-test/t/func_str.test:
  Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
mysql-test/r/func_str.result:
  Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
sql/item_strfunc.cc:
  Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
  Now the Item_func_substr::fix_length_and_dec() function correctly calculates
  the max_length parameter.

816ea8a3

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c0a05435

unknown authored Mar 10, 2007

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql


mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged

c0a05435

Fixed bug #26830: a crash for the query with a subselect containing ROLLUP. · 4d6ad7ac

unknown authored Mar 10, 2007

Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.


mysql-test/r/olap.result:
  Added a test case for bug #26830.
mysql-test/t/olap.test:
  Added a test case for bug #26830.

4d6ad7ac

09 Mar, 2007 21 commits

Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized · 944030ae

unknown authored Mar 10, 2007

away.

Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.


mysql-test/r/varbinary.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/union.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/subselect.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_test.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/having.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_regexp.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_str.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_default.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/explain.result:
  Corrected test case after fix for bug#22331.
sql/sql_union.cc:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Cleanup of the SELECT_LEX::order_list list.
sql/item.h:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Added the print() member function to the Item_field class.
sql/item.cc:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Added the print() member function to the Item_field class.

944030ae

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 8555b8d7

unknown authored Mar 09, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt


BitKeeper/deleted/.del-sql_parse.cc.rej:
  Auto merged
BitKeeper/deleted/.del-table.cc.rej:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89:
  Auto merged
mysql-test/r/group_by.result:
  manual merge to 5.1-opt
sql/mysqld.cc:
  manual merge to 5.1-opt
sql/sql_base.cc:
  manual merge to 5.1-opt
sql/sql_select.cc:
  manual merge to 5.1-opt
sql/table.h:
  manual merge to 5.1-opt

8555b8d7

Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge · 60253fd2

unknown authored Mar 09, 2007

into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt


mysql-test/r/select.result:
  null-merge
mysql-test/t/select.test:
  null-merge
sql/sql_yacc.yy:
  null-merge

60253fd2

Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge · 4aca623a

unknown authored Mar 09, 2007

into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

4aca623a

Merge bk-internal:/home/bk/mysql-5.0-opt · 81beab69

unknown authored Mar 09, 2007

into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/select.result:
  merge
mysql-test/t/select.test:
  merge

81beab69

WL#3527: Extend IGNORE INDEX so places where index is ignored can · ff79cd68

unknown authored Mar 09, 2007

         be specified
 5.0 part of the fix. Implements IGNORE INDEX FOR JOIN as a synonym
 of IGNORE INDEX for backward compatibility with the 5.1 fix.


mysql-test/r/select.result:
  WL#3527: Extend IGNORE INDEX so places where index is ignored can 
           be specified
  - test case
mysql-test/t/select.test:
  WL#3527: Extend IGNORE INDEX so places where index is ignored can 
           be specified
  - test case

ff79cd68

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 209802eb

unknown authored Mar 09, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged

209802eb

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 52fb60da
unknown authored Mar 09, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
```
52fb60da
Merge bk@192.168.21.1:mysql-5.1 · d5f3bc14
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
d5f3bc14

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c7de22a1

unknown authored Mar 09, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_str.result:
  resolved test merge conflicts
mysql-test/t/func_str.test:
  resolved test merge conflicts

c7de22a1

Bug #26281: · 29b6d554

unknown authored Mar 09, 2007

 Fixed boundry checks in the INSERT() function:
 were one off.


mysql-test/r/func_str.result:
  Bug #26281: test case
mysql-test/t/func_str.test:
  Bug #26281: test case
sql/item_strfunc.cc:
  Bug #26281: fixed boundry checks

29b6d554

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e68df7a1
unknown authored Mar 09, 2007
```
into  olga.mysql.com:/home/igor/mysql-5.0-opt


sql/item.cc:
  Auto merged
```
e68df7a1
Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 413604f9
unknown authored Mar 09, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
```
413604f9
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 84ceb01e
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


sql/sql_select.cc:
  Auto merged
```
84ceb01e

Fixed bug #26661: crash when order by clause in a union · 729bcaf4

unknown authored Mar 09, 2007

construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the 
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.


mysql-test/r/union.result:
  Added a test case for bug #26661.
mysql-test/t/union.test:
  Added a test case for bug #26661.
sql/item.cc:
  Fixed bug #26661.
  Derived tables currently cannot use outer references.
  Thus there is no outer context for them.
  The 4.1 code takes this fact into account while the 
  Item_field::fix_outer_field code of 5.0 lost the check that blocks
  any attempts to resolve names in outer context for derived tables.

729bcaf4

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 76542acd
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged
```
76542acd

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 0b85b793

unknown authored Mar 09, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging

0b85b793

Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt · 3cd8b881
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
3cd8b881

aftermerge fix · 32ed7ddc

unknown authored Mar 09, 2007


mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging

32ed7ddc

aftermerge fix · 5c1e48c5
unknown authored Mar 09, 2007
```
mysql-test/r/view.result:
  merging
```
5c1e48c5
Merge mysql.com:/home/hf/work/mysql-5.1 · e51213dd
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
e51213dd

08 Mar, 2007 11 commits

rpl_ssl.result, rpl_ssl.test: · d4ede3f5

unknown authored Mar 08, 2007

  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format


mysql-test/t/rpl_ssl.test:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
mysql-test/r/rpl_ssl.result:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

d4ede3f5

Merge bk@192.168.21.1:mysql-5.1 · 3d52be15

unknown authored Mar 08, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_str.result:
  merging
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging

3d52be15

Merge bk@192.168.21.1:mysql-5.0 · 12af6585

unknown authored Mar 08, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_str.result:
  merging
mysql-test/r/sp.result:
  merging
mysql-test/r/view.result:
  merging
mysql-test/t/func_str.test:
  merging
mysql-test/t/view.test:
  merging

12af6585

The most recent push into mysql-5.1 from mysql-5.2 was a mistake. · f68891f8

unknown authored Mar 08, 2007

This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)


configure.in:
  Reverse last push (from mysql-5.2 into mysql-5.1)
storage/ndb/src/common/util/version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)

f68891f8

Merge bk@192.168.21.1:mysql-4.1 · 0fcd9c2b
unknown authored Mar 08, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
```
0fcd9c2b
merging · 012ae635
unknown authored Mar 08, 2007

012ae635
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ceefecb2
unknown authored Mar 08, 2007
```
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged
```
ceefecb2

sql_select.cc: · 4c0ab891

unknown authored Mar 08, 2007

  Postfix for bug#22331.


sql/sql_select.cc:
  Postfix for bug#22331.

4c0ab891

Update result for 5.1 · 0381f8cf
unknown authored Mar 08, 2007

0381f8cf

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 52ce1b73

unknown authored Mar 08, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


BUILD/check-cpu:
  Auto merged
mysql-test/r/explain.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/func_in.result:
  SCCS merged
mysql-test/r/order_by.result:
  SCCS merged
mysql-test/r/sp.result:
  merging
mysql-test/t/func_in.test:
  SCCS merged
mysql-test/t/order_by.test:
  SCCS merged
mysql-test/t/view.test:
  merging
sql/item_cmpfunc.h:
  merging
sql/mysql_priv.h:
  merging
sql/sql_select.cc:
  SCCS merged

52ce1b73

Merge bk-internal:/home/bk/mysql-4.1-maint · 5130e88e
unknown authored Mar 08, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
5130e88e