Commits · 530f29d0d8a75181d4caa6c13a8c56c545c02da7 · Kirill Smelkov / mariadb

13 Mar, 2007 1 commit

Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 530f29d0

unknown authored Mar 13, 2007

into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines


storage/myisam/mi_open.c:
  Use local.

530f29d0

10 Mar, 2007 5 commits

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

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

8354916f

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

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

1625806e

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

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.

e3cf2fa2

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

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

492f3c34

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

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.

fe8951d6

09 Mar, 2007 21 commits

Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized · 9cc553a2

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.

9cc553a2

Merge bk://localhost:5556 · 90d303ee

unknown authored Mar 09, 2007

into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673

90d303ee

Merge chilla.local:/home/mydev/mysql-5.0-bug25673 · 270016d8
unknown authored Mar 09, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-bug25673


storage/myisam/rt_index.c:
  Auto merged
```
270016d8
Merge chilla.local:/home/mydev/mysql-4.1-bug25673 · 20d87068
unknown authored Mar 09, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-bug25673


myisam/rt_index.c:
  Auto merged
```
20d87068
Bug#25673 - spatial index corruption, error 126 incorrect key file for table · 1c5790bc
unknown authored Mar 09, 2007
```
Fixed a compiler warning, deteced by pushbuild only.
```
1c5790bc

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 8b3468ce

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

8b3468ce

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

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

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

38cd620f

Bug #26281: · 77d751de

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

77d751de

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


sql/item.cc:
  Auto merged
```
d9834d8b
Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 95d61b58
unknown authored Mar 09, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
```
95d61b58
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · a0260258
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


sql/sql_select.cc:
  Auto merged
```
a0260258

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

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.

d738e0ea

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


sql/sql_select.cc:
  Auto merged
```
5fbc4d9d

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

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

e7836808

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

aftermerge fix · c5082ada

unknown authored Mar 09, 2007


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

c5082ada

aftermerge fix · 7ce5a98e
unknown authored Mar 09, 2007
```
mysql-test/r/view.result:
  merging
```
7ce5a98e
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 0406a56d
unknown authored Mar 09, 2007
```
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
```
0406a56d
Merge mysql.com:/home/hf/work/mysql-5.1 · bfc7c0cf
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
bfc7c0cf

08 Mar, 2007 13 commits

Merge chilla.local:/home/mydev/mysql-5.0-bug25673 · fc31500d
unknown authored Mar 08, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-bug25673


storage/myisam/rt_index.c:
  Auto merged
```
fc31500d

rpl_ssl.result, rpl_ssl.test: · 2c7d2e1f

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

2c7d2e1f

Merge chilla.local:/home/mydev/mysql-4.1-bug25673 · d7fde174
unknown authored Mar 08, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-bug25673


myisam/rt_index.c:
  Auto merged
```
d7fde174
Bug#25673 - spatial index corruption, error 126 incorrect key file for table · 133c32b3
unknown authored Mar 08, 2007
```
After backport fix.
Added forgotten DBUG_RETURNs, which was detected in 5.1 only.
```
133c32b3

Merge bk@192.168.21.1:mysql-5.1 · 7e2327e8

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

7e2327e8

Merge bk@192.168.21.1:mysql-5.0 · 6f5f2551

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

6f5f2551

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

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)

9d50fd61

Merge bk@192.168.21.1:mysql-4.1 · 421ebc9c
unknown authored Mar 08, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
```
421ebc9c
merging · 617694dd
unknown authored Mar 08, 2007

617694dd
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f5251211
unknown authored Mar 08, 2007
```
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged
```
f5251211

sql_select.cc: · 47c82810

unknown authored Mar 08, 2007

  Postfix for bug#22331.


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

47c82810

Update result for 5.1 · 60633dc5
unknown authored Mar 08, 2007

60633dc5

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 85b60df6

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

85b60df6