Commits · e024d5c0b91411eeceb15f115250fb0b46cf9901 · nexedi / MariaDB

10 Jan, 2008 1 commit

Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 · e024d5c0

unknown authored Jan 10, 2008

into  kaamos.(none):/data/src/opt/bug33305/my51-bug33305


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/skip_grants.result:
  Manual merge.

e024d5c0

24 Dec, 2007 1 commit

Fix for bug #33305: Test case in 'skip_grants' file need dynamic loading · 8d8ef7be

unknown authored Dec 24, 2007

                    to be compiled in

The problem was that on a statically built server an attempt to create
a UDF resulted in a different, but reasonable error ("Can't open shared
library" instead of "UDFs are unavailable with the --skip-grant-tables
option"), which caused a failure for the test case for bug #32020.

Fixed by moving the test case for bug #32020 from skip_grants.test to a
separate test to ensure that it is only run when the server is built
with support for dynamically loaded libraries.


mysql-test/r/skip_grants.result:
  Moved the test case for bug #32020 to a separate test.
mysql-test/t/skip_grants.test:
  Moved the test case for bug #32020 to a separate test.
mysql-test/r/udf_skip_grants.result:
  Moved the test case for bug #32020 to a separate test.
mysql-test/t/udf_skip_grants-master.opt:
  Moved the test case for bug #32020 to a separate test.
mysql-test/t/udf_skip_grants.test:
  Moved the test case for bug #32020 to a separate test.

8d8ef7be

21 Dec, 2007 1 commit

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

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

4a045182

20 Dec, 2007 8 commits

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

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

af3dd828

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 64d0acac
unknown authored Dec 20, 2007
```
into  mysql.com:/misc/mysql/31990/50-31990
```
64d0acac

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 34e0938b

unknown authored Dec 20, 2007

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


sql/sql_select.cc:
  Auto merged

34e0938b

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


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

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

unknown authored Dec 20, 2007

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


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

cbfae7b8

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

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

c1177ef1

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


mysql-test/r/type_date.result:
  post-merge fixes: test results
```
0a1784c5

Merge mysql.com:/misc/mysql/31990/50-31990 · ef9ecd7d

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

ef9ecd7d

19 Dec, 2007 1 commit

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 515a4649

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

515a4649

18 Dec, 2007 2 commits

Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt · 28c72671

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

28c72671

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

17 Dec, 2007 20 commits

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

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

38712142

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


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


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


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

Bug#31752: check strmake() bounds · ef7c4451

unknown authored Dec 17, 2007

fix test program


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

ef7c4451

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


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

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

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

26ee76ad

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

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

cced464d

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

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

6fa6543c

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

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

b000bf74

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


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


sql/item_timefunc.cc:
  Auto merged
```
04f34d75

Merge mysql.com:/misc/mysql/32770/50-32770 · 94342d45

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

94342d45

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


client/mysqldump.c:
  Auto merged
```
01a3c7cf
Merge mysql.com:/misc/mysql/32350/50-32350 · 0f7d7b62
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/51-32350


client/mysqldump.c:
  Auto merged
```
0f7d7b62
Merge mysql.com:/misc/mysql/32350/41-32350 · cea19949
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/50-32350


client/mysqldump.c:
  Auto merged
```
cea19949

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

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.

8d6a9ea0

15 Dec, 2007 5 commits

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

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 7e550a12

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

7e550a12

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

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.

e9632ee3

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

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.

ae09bb3f

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 5b94a876
unknown authored Dec 14, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27848
```
5b94a876

14 Dec, 2007 1 commit

Fixed bug #27848. · e8d00ea7

unknown authored Dec 14, 2007

In a union without braces, the order by at the end is applied to the 
overall union. It therefore should not interfere with the individual
select parts of the union.

Fixed by changing our parser rules appropriately.


mysql-test/r/union.result:
  Added a test case for bug #27848.
mysql-test/t/union.test:
  Added a test case for bug #27848.

e8d00ea7