into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged

into  polly.(none):/home/kaa/src/opt/bug32376/my51-bug26215


client/mysql.cc:
  Manual merge.

disables the option explicitely.
Changed the option location in code so that --help will show it in
lexical option order.

This is for bug #26215: mysql command line client should not strip
comments from SQL statements


client/mysql.cc:
  Changed the help text for --comments to make it clear which option
  disables the option explicitely.
  Changed the option location in code so that --help will show it in
  lexical option order.

added check for the result of mysql_unpack_partition()


sql/table.cc:
  added check for the result of mysql_unpack_partition()

into  gleb.loc:/work/bk/5.1-opt


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.cc:
  Merge with 5.0-opt.

Comparison of a BIGINT NOT NULL column with a constant arithmetic
expression that evaluates to NULL caused error 1048: "Column '...'
cannot be null".

Made convert_constant_item() check if the constant expression is NULL
before attempting to store it in a field. Attempts to store NULL in a
NOT NULL field caused query errors.


sql/item_cmpfunc.cc:
  Fixed bug #32335.
  1. Made convert_constant_item() check if the constant expression is NULL
     before attempting to store it in a field. Attempts to store NULL in
     a NOT NULL field caused query errors.
  
  2. Also minor bug has been fixed: the thd->count_cuted_fields value
     was not restored in case of successful conversion.
mysql-test/t/select.test:
  Added test case for bug #32335.
mysql-test/r/select.result:
  Added test case for bug #32335.

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


sql/field.cc:
  Auto merged

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

into  mysql.com:/home/hf/work/31158/my41-31158

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


sql/field.cc:
  Auto merged

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


sql/field.cc:
  Auto merged

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


mysql-test/t/gis.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
mysql-test/r/gis.result:
  merging

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


mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
mysql-test/r/gis.result:
  merging
sql/field.cc:
  merging

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


sql/sql_select.cc:
  Auto merged

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


sql/sql_select.cc:
  Auto merged

into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged

into  polly.(none):/home/kaa/src/opt/bug32241/my51-bug29131


mysql-test/r/explain.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

checked for each record'

The problem was in incorrectly calculated length of the buffer used to
store a hexadecimal representation of an index map in
select_describe(). This could result in buffer overrun and stack
corruption under some circumstances.

Fixed by correcting the calculation.


mysql-test/r/explain.result:
  Added a test case for bug #32241.
mysql-test/t/explain.test:
  Added a test case for bug #32241.
sql/sql_select.cc:
  Corrected the buffer length calculation. Count one hex digit as 4 bits,
  not 8.

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/type_date.result:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/handler.cc:
  use local
storage/blackhole/ha_blackhole.cc:
  use local
storage/blackhole/ha_blackhole.h:
  ul

Implement neccessary shared lock structure for table locks.
This is the backport of bug26241 fix.


sql/ha_blackhole.cc:
  Implement neccessary shared lock structure for table locks.
sql/ha_blackhole.h:
  Declare shared structure for table locks
sql/handler.cc:
  added BLACKHOLE_DB case

into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.0-opt


mysql-test/r/type_date.result:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged

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


mysql-test/r/log_tables.result:
  Auto merged

tests adjusted for Windows


mysql-test/r/log_tables.result:
  Be more conservative in tests (for Windows)
mysql-test/t/log_tables.test:
  Be more conservative in tests (for Windows)

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


mysql-test/t/type_date.test:
  Auto merged
sql/sql_select.h:
  Auto merged
mysql-test/r/type_date.result:
  merge of bug 31928 to 5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/t/select.test:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/select.result:
  manual merge
mysql-test/t/select.test:
  manual merge

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/select.result:
  manual merge
mysql-test/t/select.test:
  manual merge

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.1-opt