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

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

into  mbp.:/Users/kaa/src/opt/bug33389/my51-bug25162


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Manual merge.
sql/item.cc:
  Manual merge.

                    or trigger crashes server

Under some circumstances a combination of VIEWs, subselects with outer
references and PS/SP/triggers could lead to use of uninitialized memory
and server crash as a result.

Fixed by changing the code in Item_field::fix_fields() so that in cases
when the field is a VIEW reference, we first check whether the field
is also an outer reference, and mark it appropriately before returning.


mysql-test/r/view.result:
  Added a test case for bug #33389.
mysql-test/t/view.test:
  Added a test case for bug #33389.
sql/item.cc:
  In cases when in Item_field::fix_fields() from_field is a view reference,
  do not return too early, i.e. before marking the reference as an outer
  one when needed.

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

into  mysql.com:/home/hf/work/33796/my51-33796

into  mysql.com:/home/hf/work/33796/my51-33796


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged

into  mysql.com:/home/hf/work/33796/my50-33796


libmysql/libmysql.c:
  merging
libmysqld/lib_sql.cc:
  merging

Field data for a query was stored to the stmt->alloc that is emptied
with mysql_stmt_close statement only. That means a lot of memory can
be occupied without a reason if used doesn't call mysql_stmt_close often.


libmysql/libmysql.c:
  Bug #33796 Memory leak for prepared statements in embedded server.
  
  Clean up result->alloc even if there's no 'data' created
libmysqld/lib_sql.cc:
  Bug #33796 Memory leak for prepared statements in embedded server.
  
  alloc 'fields' in the 'result.alloc' as the 'mem_root' is only cleaned with
  mysql_stmt_close'

into  mysql.com:/home/tnurnberg/21567/51-21567


sql/mysqld.cc:
  Auto merged

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

into  blasphemy.intern.azundris.com:/home/tnurnberg/21567/51-21567


sql/mysqld.cc:
  Auto merged

Don't block SIGINT (Control-C) when --gdb is passed to mysqld.
Was broken at least on OS X.

(kudos to Mattias Jonsson)


sql/mysqld.cc:
  Don't block SIGINT when TEST_SIGINT (--gdb) is used, even if
  thr_kill_signal is some other signal (SIGUSR2) and
  pthread_sigmask() in signal_hand() isn't good enough.

into  mbp.local:/Users/kaa/src/opt/mysql-5.1-opt

into  mbp.local:/Users/kaa/src/opt/bug25162/my51-bug25162


mysql-test/t/create.test:
  Auto merged
sql/sql_yacc.yy:
  Null merge.
mysql-test/r/create.result:
  Manual merge.

                    on table creates

The problem was in incompatible syntax for key definition in CREATE
TABLE.

5.0 supports only the following syntax for key definition (see "CREATE
TABLE syntax" in the manual):

{INDEX|KEY} [index_name] [index_type] (index_col_name,...)

While 5.1 parser supports the above syntax, the "preferred" syntax was
changed to:

{INDEX|KEY} [index_name] (index_col_name,...) [index_type]

The above syntax is used in 5.1 for the SHOW CREATE TABLE output, which
led to dumps generated by 5.1 being incompatible with 5.0.

Fixed by changing the parser in 5.0 to support both 5.0 and 5.1 syntax
for key definition.


mysql-test/r/create.result:
  Added a test case for bug #25162.
mysql-test/t/create.test:
  Added a test case for bug #25162.
sql/sql_yacc.yy:
  Changed the parser to support both 5.0 and 5.1 syntax for index type
  specification in CREATE TABLE.

into  mysql.com:/home/hf/work/25426/my51-25426

Error message modified to be consistent with the manual.


mysql-test/r/alter_table.result:
  Bug #25426 Prefix index on DECIMAL column causes warning.
  
  test result fixed
sql/share/errmsg.txt:
  Bug #25426 Prefix index on DECIMAL column causes warning.
  
  error messages modified

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

  require SQL_BIG_SELECTS=1

There was a previous test that leaves a non-default (small) max_join_size.
Fixed by re-setting the max_join_size to default when the test is over.


mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Bug #31524: side effects of previous testsuites fixed
mysql-test/suite/rpl/r/rpl_row_charset.result:
  Bug #31524: side effects of previous testsuites fixed
mysql-test/suite/rpl/r/rpl_row_charset_innodb.result:
  Bug #31524: side effects of previous testsuites fixed
mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result:
  Bug #31524: side effects of previous testsuites fixed

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

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


mysql-test/r/subselect.result:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.

of cleanups in the test case for bug33794.

mysql-test/r/group_by.result:
  Post-merge fix after merging 5.0-opt to 5.1-opt.
mysql-test/t/disabled.def:
  Disabled innodb_mysql back, bug #32724 is still not fixed.

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


mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  Manual merge.
mysql-test/t/group_by.test:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.

into  lamia.dupka:/home/mhansson/my50-bug33143-again-pushee

The problem occurred when one had a subquery that had an equality X=Y where 
Y referred to a named select list expression from the parent select. MySQL 
crashed when trying to use the X=Y equality for ref-based access. 

Fixed by allowing non-Item_field items in the described case.


mysql-test/r/subselect.result:
  BUG#33794 "MySQL crashes executing specific query"
  - Testcase
mysql-test/t/subselect.test:
  BUG#33794 "MySQL crashes executing specific query"
  - Testcase
sql/sql_select.cc:
  BUG#33794 "MySQL crashes executing specific query"
  get_store_key() assumed that if it got a reference
    t.key=Item_outer_ref(Item_direct_ref(x)) 
  then x was an Item_field object, which is not the case when one refers to a
  named select list expression out ot subquery.

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


sql/item_func.cc:
  Auto merged
mysql-test/r/type_decimal.result:
  Bug#33143: Manual merge
mysql-test/t/type_decimal.test:
  Bug#33143: Manual merge

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


mysql-test/r/type_decimal.result:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/decimal.c:
  Auto merged

into  linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again-pushee


sql/item_func.cc:
  Auto merged
mysql-test/r/type_decimal.result:
  Bug#33143: Manual merge
mysql-test/t/type_decimal.test:
  Bug#33143: Manual merge

The ROUND(X, D) function would change the Item::decimals field during
execution to achieve the effect of a dynamic number of decimal digits.
This caused a series of bugs:
Bug #30617:Round() function not working under some circumstances in InnoDB
Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
Bug #30889:filesort and order by with float/numeric crashes server
Fixed by never changing the number of shown digits for DECIMAL when
used with a nonconstant number of decimal digits.


mysql-test/r/type_decimal.result:
  Bug#33143: Test result
mysql-test/t/type_decimal.test:
  Bug#33143: Test case
sql/item_func.cc:
  Bug#33143: 
  - Moved the DECIMAL_MAX_SCALE limitation to fix_length_and_dec.
  - Removed resetting of Item::decimals field.
  - set the frac field of the output value to current scale.
strings/decimal.c:
  Bug#33143: It is necessary to set all digits in the buffer following the 
  rounded one to zero, as they may now be displayed.

into  lamia.dupka:/home/mhansson/my50-bug31797-pushee

into  lamia.dupka:/home/mhansson/my51-bug31797-pushee

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


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

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


sql/item.cc:
  Auto merged
mysql-test/r/group_by.result:
  Bug#31797: Manual merge
mysql-test/t/group_by.test:
  Bug#31797: Manual merge

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697


mysql-test/t/disabled.def:
  Auto merged
sql/sql_select.cc:
  Auto merged

When the function test_if_skip_sort_order prefers index backward scan 
to ref access the corresponding access functions must be set accordingly.


mysql-test/include/mix1.inc:
  Added a test case for bug #33697.
  Corrected one previous bad merge.
mysql-test/r/innodb_mysql.result:
  Added a test case for bug #33697.
mysql-test/t/disabled.def:
  Turned innodb_mysql test on.

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


sql/item.cc:
  Auto merged
mysql-test/r/group_by.result:
  Bug#31797: Manual merge
mysql-test/t/group_by.test:
  Bug#31797: Manual merge

The name resolution for correlated subqueries and HAVING clauses
failed to distinguish which of two was being performed when there 
was a reference to an outer aliased field.
Fixed by adding the condition that HAVING clause name resulotion
is being performed.


mysql-test/r/group_by.result:
  Bug#31797: Test result
mysql-test/t/group_by.test:
  Bug#31797: Test case
sql/item.cc:
  Bug#31797: 
  Corrected function comment.
  The fix, raising the error is restricted to HAVING name resolution.