Commits · d12cc6e066dd32e0f6698f9fe9e0d27e8b3056f9 · Kirill Smelkov / mariadb

09 Jan, 2008 3 commits

merge of the fix for bug 33133 to 5.1-opt · d12cc6e0
unknown authored Jan 09, 2008

d12cc6e0

Merge macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.0-opt · e2584c9f

unknown authored Jan 09, 2008

into  macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.1-opt


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/sql_base.cc:
  Auto merged

e2584c9f

Bug #33133: Views are not transparent · 06b68454

unknown authored Jan 09, 2008

When resolving references we need to take into consideration
the view "fields" and allow qualified access to them.
Fixed by extending the reference resolution to process view
fields correctly.


mysql-test/r/func_group.result:
  Bug #33133: test case
mysql-test/t/func_group.test:
  Bug #33133: test case
sql/sql_base.cc:
  Bug #33133: allow qualified alias refs to view fields

06b68454

08 Jan, 2008 2 commits

merge of bug 33256 5.0-opt -> 5.1-opt · 34cae156
unknown authored Jan 08, 2008

34cae156

Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt · c82a7b94

unknown authored Jan 08, 2008

into  macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.1-opt


mysql-test/r/union.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_decimal.result:
  merge of bug 33256 5.0-opt -> 5.1-opt
mysql-test/t/union.test:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/field.h:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item.cc:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_sum.cc:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_timefunc.cc:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_timefunc.h:
  merge of bug 33256 5.0-opt -> 5.1-opt

c82a7b94

21 Dec, 2007 2 commits

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · baf5c2c1

unknown authored Dec 21, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/union.result:
  Bug#32848: Manual merge
mysql-test/t/union.test:
  Bug#32848: Manual merge

baf5c2c1

Bug #33256: CREATE ... SELECT creates obsolete table · 2ae4b047

unknown authored Dec 21, 2007

 w/ Field_date instead of Field_newdate
  
Field_date was still used in temp table creation.
Fixed by using Field_newdate consistently throughout the server
except when reading tables defined with older MySQL version.
No test suite is possible because both Field_date and Field_newdate
return the same values in all the metadata calls. 


mysql-test/r/type_decimal.result:
  Bug #33256: removed redundant warnings
sql/field.h:
  Bug #33256: Add a constructor similar to Field_date::Field_date()
sql/item.cc:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT
sql/item_sum.cc:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT
sql/item_timefunc.cc:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT
sql/item_timefunc.h:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT

2ae4b047

20 Dec, 2007 6 commits

Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gca · fbb25b7c

unknown authored Dec 20, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848-gca


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/field.cc:
  Bug#32848: Manual merge
sql/item.cc:
  Bug#32848: Manual merge

fbb25b7c

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 3e2531b9

unknown authored Dec 20, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848


sql/sql_select.cc:
  Auto merged

3e2531b9

Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38 · a8d1b13f
unknown authored Dec 20, 2007
```
Warnings elimination


sql/sql_select.cc:
  Bug#32848: Warnings elimination
```
a8d1b13f

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 3a13408f

unknown authored Dec 20, 2007

into  mysql.com:/misc/mysql/31990/51-31990


mysql-test/r/type_date.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

3a13408f

Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE · 473d4247
unknown authored Dec 20, 2007
```
post-merge fixes


mysql-test/r/type_date.result:
  post-merge fixes: test results
```
473d4247

Merge mysql.com:/misc/mysql/31990/50-31990 · 0aec8b21

unknown authored Dec 20, 2007

into  mysql.com:/misc/mysql/31990/51-31990


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
mysql-test/r/type_date.result:
  manual merge
mysql-test/t/type_date.test:
  manual merge
sql/field.cc:
  manual merge

0aec8b21

19 Dec, 2007 1 commit

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 5480cbd6

unknown authored Dec 19, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/union.result:
  Bug#32848: Manual merge
mysql-test/t/union.test:
  Bug#32848: Manual merge

5480cbd6

18 Dec, 2007 2 commits

Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt · 82e026c1

unknown authored Dec 18, 2007

into  magare.gmz:/home/kgeorge/mysql/work/B19390-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_trigger.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_trigger.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/r/union.result:
  Merged bug 27848 to 5.1-opt
mysql-test/t/union.test:
  Merged bug 27848 to 5.1-opt
sql/sql_yacc.yy:
  Merged bug 27848 to 5.1-opt

82e026c1

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 55d284d4
unknown authored Dec 18, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt
```
55d284d4

17 Dec, 2007 20 commits

Bug #19390: Test 'rpl_trigger' fails, might be random · 3e61561a

unknown authored Dec 17, 2007

The checks in the test for bug #12480 were too wide and
made the test to depend on the procedures and triggers
present in the server.
Corrected the test to check only for the procedure and 
trigger it creates.


mysql-test/r/rpl_trigger.result:
  Bug #19390: corrected the test to check for its procedure only
mysql-test/t/rpl_trigger.test:
  Bug #19390: corrected the test to check for its procedure only

3e61561a

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 8aac47e2
unknown authored Dec 17, 2007
```
into  sin.intern.azundris.com:/misc/mysql/32770/51-32770
```
8aac47e2
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 5b5e0da0
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32770/50-32770
```
5b5e0da0
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a4c45612
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/31752_/50-31752_


client/mysqltest.c:
  Auto merged
```
a4c45612
Merge mysql.com:/misc/mysql/31752_/50-31752_ · e8fec425
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/31752_/51-31752_


client/mysqltest.c:
  Auto merged
```
e8fec425
Merge mysql.com:/misc/mysql/31752_/41-31752_ · e5b3254e
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/31752_/50-31752_


client/mysqltest.c:
  Auto merged
```
e5b3254e

Bug#31752: check strmake() bounds · 9295bc34

unknown authored Dec 17, 2007

fix test program


client/mysqltest.c:
  fix buffer off-by-ones in test program

9295bc34

Bug#31752: check strmake() bounds · f95ae050
unknown authored Dec 17, 2007
```
build fixes


strings/strmake.c:
  build fix
```
f95ae050
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 966aef3d
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32770/50-32770
```
966aef3d

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · adfbe1fb

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/31752_/51-31752_


client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

adfbe1fb

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 607941de

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/31752_/50-31752_


client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

607941de

Merge mysql.com:/misc/mysql/31752_/50-31752_ · ba050667

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/31752_/51-31752_


mysys/mf_pack.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

ba050667

Merge mysql.com:/misc/mysql/31752_/41-31752_ · 02cdb7ec

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/31752_/50-31752_


mysys/mf_pack.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  manual merge
sql/unireg.cc:
  manual merge

02cdb7ec

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · f318e43f
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32770/51-32770


sql/item_timefunc.cc:
  Auto merged
```
f318e43f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · abae2dcc
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32770/50-32770


sql/item_timefunc.cc:
  Auto merged
```
abae2dcc

Merge mysql.com:/misc/mysql/32770/50-32770 · 19ecb948

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/32770/51-32770


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

19ecb948

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 734c6286
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/51-32350


client/mysqldump.c:
  Auto merged
```
734c6286
Merge mysql.com:/misc/mysql/32350/50-32350 · 309845de
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/51-32350


client/mysqldump.c:
  Auto merged
```
309845de
Merge mysql.com:/misc/mysql/32350/41-32350 · 8d495f57
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/50-32350


client/mysqldump.c:
  Auto merged
```
8d495f57

Bug#32350: mysqldump should show more version information in output · ef280203

unknown authored Dec 17, 2007

show version of mysqldump, release of server et al., and version of
current server in mysqldumps.


client/mysqldump.c:
  show version of mysqldump, release of server et al., and version of
  current server in mysqldumps.

ef280203

15 Dec, 2007 4 commits

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · fe28526b
unknown authored Dec 15, 2007
```
into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push
```
fe28526b

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 30b17b99

unknown authored Dec 15, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/union.result:
  Bug#32858: Manual merge
mysql-test/t/union.test:
  Bug#32858: Manual merge

30b17b99

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 4f44d701

unknown authored Dec 15, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push


sql/item_sum.cc:
  Auto merged
mysql-test/r/func_gconcat.result:
  Bug#32798: Manual merge.
mysql-test/t/func_gconcat.test:
  Bug#32798: Manual merge.

4f44d701

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 86138a28

unknown authored Dec 15, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united-push


sql/item_sum.cc:
  Auto merged
mysql-test/r/func_gconcat.result:
  Bug#32798: Manual merge.
mysql-test/t/func_gconcat.test:
  Bug#32798: Manual merge.

86138a28