Commits · 581af6849751616d8cdccf10ae106d59ec542bac · nexedi / MariaDB

19 Mar, 2008 8 commits

Merge host.loc:/home/uchum/work/5.0-opt · 581af684
unknown authored Mar 20, 2008
```
into  host.loc:/home/uchum/work/5.1-opt


sql/item.cc:
  Auto merged
```
581af684

Merge host.loc:/home/uchum/work/PA/5.0-opt-34763 · b9cad609

unknown authored Mar 20, 2008

into  host.loc:/home/uchum/work/5.1-opt


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

b9cad609

Merge host.loc:/home/uchum/work/PA/5.0-opt-34763 · 622aec64
unknown authored Mar 20, 2008
```
into  host.loc:/home/uchum/work/5.0-opt


sql/item.cc:
  Auto merged
```
622aec64
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 608f7cab
unknown authored Mar 19, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
608f7cab
Merge kaamos.(none):/data/src/opt/bug34512/my51 · 74d9e4ec
unknown authored Mar 19, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/item_sum.cc:
  Auto merged
```
74d9e4ec
Merge kaamos.(none):/data/src/opt/bug34512/my50 · 6245765c
unknown authored Mar 19, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
6245765c

Merge kaamos.(none):/data/src/opt/bug34512/my50 · d1d6193a

unknown authored Mar 19, 2008

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


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

d1d6193a

Merge kaamos.(none):/data/src/opt/bug34650/my51 · e7d51f0c

unknown authored Mar 19, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/change_user.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/change_user.test:
  Auto merged

e7d51f0c

18 Mar, 2008 1 commit

Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTS · 977c2db4

unknown authored Mar 18, 2008

added intialization of f_key_info.referenced_key_name for the case when
referenced table is dropped


storage/innobase/handler/ha_innodb.cc:
  added intialization of f_key_info.referenced_key_name for the case when
  referenced table is dropped

977c2db4

14 Mar, 2008 2 commits

Fixed bug #34763. · a000e8f0

unknown authored Mar 14, 2008

Queries like:

  SELECT ROW(1, 2) IN (SELECT t1.a, 2)
    FROM t1 GROUP BY t1.a

or 

  SELECT ROW(1, 2) IN (SELECT t1.a, 2 FROM t2)
    FROM t1 GROUP BY t1.a

lead to assertion failure in the
Item_in_subselect::row_value_transformer method in debugging
build, or to unexpected error message in release build:

  ERROR 1247 (42S22): Reference '<list ref>' not supported (forward
                      reference in item list)

Unexpected error message and assertion failure have been
eliminated.


mysql-test/r/subselect3.result:
  Added test case for bug #34763.
mysql-test/t/subselect3.test:
  Added test case for bug #34763.
sql/item.cc:
  Fixed bug #34763.
  The Item_ref::fix_fields method has been modified to silently
  ignore not fixed outer references: by the definition, those
  references should be fixed later by the call to the
  fix_inner_refs function.
sql/item_subselect.cc:
  Fixed bug #34763.
  The Item_in_subselect::row_value_transformer method has been
  modified to eliminate assertion failure on not fixed outer
  references: by the definition those references are allowed in
  this context and should be fixed later by the call to the
  fix_inner_refs function.

a000e8f0

Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashes · 82435b14

unknown authored Mar 14, 2008

referenced_key_name field can be uninitialized in the case when
referenced table is dropped.
Added codition which allows to handle this situation.


mysql-test/r/information_schema_inno.result:
  test result
mysql-test/t/information_schema_inno.test:
  test result
sql/sql_show.cc:
  referenced_key_name field can be uninitialized in the case when
  referenced table is dropped.
  Added codition which allows to handle this situation.

82435b14

13 Mar, 2008 2 commits

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · f36c8297
unknown authored Mar 13, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Null merge.
```
f36c8297

Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures · ecc147f2

unknown authored Mar 13, 2008

  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.


tests/mysql_client_test.c:
  Disable test case.

ecc147f2

12 Mar, 2008 10 commits

Fixed test failures caused by insufficient cleanups in the tests for · eefc19c5
unknown authored Mar 12, 2008
```
bug12713.
```
eefc19c5

Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 0d35eafc

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

0d35eafc

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · df7268dc
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Manual merge.
```
df7268dc
Post-merge fix. · 821d164b
unknown authored Mar 12, 2008

821d164b
Re-enabled the test for mysql_insert_id() after merging from main. · 6927cb04
unknown authored Mar 12, 2008

6927cb04

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 2d91ad60

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

2d91ad60

Merge kaamos.(none):/data/src/mysql-5.1 · e38a0de2

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  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_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

e38a0de2

Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · ddfd9942
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
ddfd9942

Merge kaamos.(none):/data/src/mysql-5.0 · 242078d0

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.

242078d0

Merge kaamos.(none):/data/src/mysql-4.1 · 70cc07cf
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
```
70cc07cf

11 Mar, 2008 3 commits

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 6189a1d3

unknown authored Mar 11, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Manual merge.

6189a1d3

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · ee87eaa4
unknown authored Mar 11, 2008
```
into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee
```
ee87eaa4
Merge bk@192.168.21.1:mysql-5.1-opt · 64549fed
unknown authored Mar 11, 2008
```
into  mysql.com:/home/hf/work/32801/my51-32801
```
64549fed

10 Mar, 2008 6 commits

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

unknown authored Mar 10, 2008

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


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged

ec893324

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

unknown authored Mar 10, 2008

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


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

2c9fe71c

Merge mysql.com:/misc/mysql/34749/50-34749 · 955be183

unknown authored Mar 10, 2008

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


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/ha_ndbcluster_cond.cc:
  Auto merged
sql/ha_ndbcluster_cond.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged

955be183

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · c0340d6b
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645
```
c0340d6b
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f1057cf4
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/50-29645
```
f1057cf4
Merge mysql.com:/misc/mysql/29645/50-29645 · d3e6e496
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645


scripts/mysql_config.sh:
  Auto merged
```
d3e6e496

08 Mar, 2008 3 commits
- Merge kaamos.(none):/data/src/opt/bug34889/my51 · a0cc986f
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_insert.cc:
  Auto merged
```
  a0cc986f
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 3620bee9
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
  3620bee9
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 9c24d728
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/bug34889/my51


sql/sql_insert.cc:
  Null merge.
tests/mysql_client_test.c:
  Manual merge.
```
  9c24d728
07 Mar, 2008 5 commits

Merge host.loc:/home/uchum/work/5.0-opt · 37b0a659
unknown authored Mar 07, 2008
```
into  host.loc:/home/uchum/work/5.0-opt-34763
```
37b0a659

Fix for bug #34650: Test suite without cluster fails on Mac OS X · f4d7e8b6

unknown authored Mar 07, 2008

                    Leopard.

The change_user test failed because results of some statements
depended on platform and server build flags.

subselect_notembedded failure was a result of a bad merge from 5.0.

Fixed the corresponding test cases.


mysql-test/r/change_user.result:
  Fixed the test case.
mysql-test/r/subselect.result:
  Fixed the test case.
mysql-test/r/subselect_notembedded.result:
  Fixed the test case.
mysql-test/t/change_user.test:
  Fixed the test case.
mysql-test/t/subselect.test:
  Fixed the test case.
mysql-test/t/subselect_notembedded.test:
  Fixed the test case.

f4d7e8b6

Bug #34367: sql/sql_show.cc: create_schema_table should handle · 6976876e

unknown authored Mar 07, 2008

MYSQL_TYPE_NEWDECIMAL

Added support for the type MYSQL_TYPE_NEWDECIMAL. It now works like
MYSQL_TYPE_DECIMAL. Unfortunately there cannot be a test case until
we have a working information_schema plugin as part of the source
distribution.


sql/sql_show.cc:
  Bug#34367: The fix. Corrected wrong comments and a DBUG_ENTER with wrong 
  function name.
sql/table.h:
  Bug#34367: Added comments to st_field_info.

6976876e

Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt · df70a47f
unknown authored Mar 07, 2008
```
into  magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt


client/mysqldump.c:
  Auto merged
```
df70a47f
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 44704088
unknown authored Mar 07, 2008
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt
```
44704088