Commits · 1b6118190ef30d4211609e284d164873f11c8688 · nexedi / MariaDB

21 Mar, 2008 3 commits

Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt · 1b611819

unknown authored Mar 21, 2008

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


CMakeLists.txt:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/procedure.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/handler.h:
  merged bug 26461 to 5.1-opt
sql/mysql_priv.h:
  merged bug 26461 to 5.1-opt
sql/sql_base.cc:
  merged bug 26461 to 5.1-opt
sql/sql_prepare.cc:
  merged bug 26461 to 5.1-opt

1b611819

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a3558b5f
unknown authored Mar 21, 2008
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
```
a3558b5f

Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) · cebb6727

unknown authored Mar 21, 2008

The bool data type was redefined to BOOL (4 bytes on windows).
Removed the #define and fixed some of the warnings that were uncovered
by this.
Note that the fix also disables 2 warnings :
4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning)
4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation

These warnings will be handled in a separate bug, as they are performance related or bogus.

Fixed to int the return type of functions that return more than 
2 distinct values.


CMakeLists.txt:
  Bug #26461: disable the C4800 and C4805 warnings temporarily
include/config-win.h:
  Bug #26461: 
   - no need for this define for Windows.
   - windows C++ compilers have a bool type
include/my_global.h:
  Bug #26461: removed bool_defined (no longer needed)
sql/handler.h:
  Bug #26461: bool functions must return boolean values
sql/mysql_priv.h:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/procedure.h:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_acl.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_acl.h:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_analyse.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_analyse.h:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_base.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_db.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_delete.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_load.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_parse.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_prepare.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.
sql/sql_update.cc:
  Bug #26461: fixed return type of functions that return more than
  2 distinct values.

cebb6727

19 Mar, 2008 8 commits

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


sql/item.cc:
  Auto merged
```
6c61454b

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

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

eb2260df

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


sql/item.cc:
  Auto merged
```
070a2334
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 412a42b3
unknown authored Mar 19, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
412a42b3
Merge kaamos.(none):/data/src/opt/bug34512/my51 · c0ba9a9e
unknown authored Mar 19, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


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

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

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

e829d363

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

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

842fd8ba

18 Mar, 2008 1 commit

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

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

f467cbaf

14 Mar, 2008 2 commits

Fixed bug #34763. · 9699767c

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.

9699767c

Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashes · 45b4d937

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.

45b4d937

13 Mar, 2008 2 commits

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


tests/mysql_client_test.c:
  Null merge.
```
269ebe54

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

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.

f20fe94b

12 Mar, 2008 10 commits

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

Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 6c2f9bf5

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

6c2f9bf5

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


tests/mysql_client_test.c:
  Manual merge.
```
9fcf16a0
Post-merge fix. · fe846378
unknown authored Mar 12, 2008

fe846378
Re-enabled the test for mysql_insert_id() after merging from main. · 615db68d
unknown authored Mar 12, 2008

615db68d

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 69d49bca

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

69d49bca

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

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.

d6df18dd

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

Merge kaamos.(none):/data/src/mysql-5.0 · 09f8a4af

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.

09f8a4af

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

11 Mar, 2008 3 commits

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

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.

a5e775b4

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

10 Mar, 2008 6 commits

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

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

ccf7f74e

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

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

0abcb8ca

Merge mysql.com:/misc/mysql/34749/50-34749 · 111de516

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

111de516

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · d9850aae
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645
```
d9850aae
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9ddecde4
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/50-29645
```
9ddecde4
Merge mysql.com:/misc/mysql/29645/50-29645 · 230c7a4c
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645


scripts/mysql_config.sh:
  Auto merged
```
230c7a4c

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


sql/sql_insert.cc:
  Auto merged
```
  87a866ef
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 319cd7e4
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
  319cd7e4
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 92e0fbbe
  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.
```
  92e0fbbe
07 Mar, 2008 2 commits

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

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

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.

0ba100d3