into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390

into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge


mysql-test/r/ps.result:
  Use local.
mysql-test/r/sp.result:
  Use local
mysql-test/t/ps.test:
  Use local
mysql-test/t/sp.test:
  Use local
sql/mysql_priv.h:
  Use local
sql/sql_class.h:
  Use local
sql/sql_insert.cc:
  Use local
sql/sql_lex.cc:
  Use local
sql/sql_lex.h:
  Use local
sql/sql_list.h:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_show.cc:
  Use local
sql/sql_table.cc:
  Use local
sql/sql_yacc.yy:
  Use local

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390


mysql-test/t/ndb_lock.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/ndb_lock.result:
  Manual merge.

of untouched rows in full table scans".

SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as
UPDATE/DELETE statements which were executed using full table
scan were not releasing locks on rows which didn't satisfy
WHERE condition.
This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables
intentionally don't support such unlocking in default mode).

This problem occured because code implementing join didn't call
handler::unlock_row() for rows which didn't satisfy part of condition
attached to this particular table/level of nested loop. So we solve
the problem adding this call.
Note that we already had this call in place in 4.1 but it was lost
(actually not quite correctly placed) when we have introduced nested 
joins.

Also note that additional QA should be requested once this patch is
pushed as interaction between handler::unlock_row() and many recent
MySQL features such as subqueries, unions, views is not tested enough.


mysql-test/r/ndb_lock.result:
  Enabled back part of the test that covers bug #20390 "SELECT FOR
  UPDATE does not release locks of untouched rows in full table scans".
  Adjusted test in such way that it now covers both execution paths
  in which we unlock non-matching rows inspected during table scan.
mysql-test/t/ndb_lock.test:
  Enabled back part of the test that covers bug #20390 "SELECT FOR
  UPDATE does not release locks of untouched rows in full table scans".
  Adjusted test in such way that it now covers both execution paths
  in which we unlock non-matching rows inspected during table scan.
sql/sql_select.cc:
  evaluate_join_record() should call handler::unlock_row() for records
  which don't satisfy condition which was pushed-down to this table/level
  of nested loop.
  We just put back the thing that we already have in 4.1 and which was lost
  when we have introduced nested joins.

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/csv.test:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

sql/CMakeLists.txt:
  Fixed windows build break, file item_uniq.cc has been removed.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22687


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-item_uniq.cc:
  Auto merged
BitKeeper/deleted/.del-item_uniq.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

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


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/join.result:
  manual merge
mysql-test/t/join.test:
  manual merge

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


sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

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

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


sql/mysqld.cc:
  Auto merged

fixed valgrind error
fixed indentation

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build


configure.in:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

According to some internal communication, these two functions are place
holders for future enhancements. Because they use a variable number of
parameters, the implementation defined a reserved keyword for them in the
parser grammar.

Unfortunately, doing so creates a bug similar to Bug 21114 reported for the
function FORMAT.

In the 5.1 code base, due to improvements in the code implemented with bug
21114, having a reserved keyword for functions with a variable number of
arguments is not needed any more by the implementation.

As a result, this fix removes the place-holder implementation, and removes
the unnecessary reserved keywords. Should the functions UNIQUE_USERS and
GROUP_UNIQUE_USERS be finally implemented in a later release, the
implementation should sub class Create_native_func in sql/item_create.cc.
For example, see the class Create_func_concat.


BitKeeper/deleted/.del-item_uniq.cc:
  Rename: sql/item_uniq.cc -> BitKeeper/deleted/.del-item_uniq.cc
BitKeeper/deleted/.del-item_uniq.h:
  Rename: sql/item_uniq.h -> BitKeeper/deleted/.del-item_uniq.h
libmysqld/Makefile.am:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
mysql-test/r/parser.result:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
mysql-test/t/parser.test:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/Makefile.am:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/item.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/item_sum.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/lex.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/mysql_priv.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/sql_yacc.yy:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().

into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
configure.in:
  Manual merge
mysql-test/install_test_db.sh:
  Manual merge
sql/mysqld.cc:
  Manual merge

into  trift2.:/MySQL/M51/push-5.1


mysys/my_read.c:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Null merge.
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merge.
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Null merge.
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Null merge.
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Null merge.
scripts/make_binary_distribution.sh:
  Null merge, this change is already suppressed in 4.1.
support-files/MySQL-shared-compat.spec.sh:
  Null merge, this change is already suppressed in 4.1.

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge.
mysql-test/t/csv.test:
  Manual merge.

into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged

into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt


sql/sql_base.cc:
  Auto merged

           aliases ignored
When a column reference to a column in JOIN USING is resolved and a new 
Item is created for this column the user defined name was lost.
This fix preserves the alias by setting the name of the new Item to the
original alias.


mysql-test/r/join.result:
  BUG#25106: A USING clause in combination with a VIEW results in column
             aliases ignored
   - test case
mysql-test/t/join.test:
  BUG#25106: A USING clause in combination with a VIEW results in column
             aliases ignored
   - test case
sql/sql_base.cc:
  BUG#25106: A USING clause in combination with a VIEW results in column
             aliases ignored
   - take the alias of the Item to be replaced and set it into the newly
     allocated Item.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25183


sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

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

into  mysql.com:/d2/hf/mr10/my51-mr10


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

into  mysql.com:/d2/hf/mr10/my50-mr10


sql/mysqld.cc:
  Auto merged

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0


configure.in:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/mysqld.cc:
  Auto merged
win/configure.js:
  Auto merged

into  olga.mysql.com:/home/igor/mysql-4.1-opt

  Corrected default for --disable-grant-options


configure.in:
  Corrected default for --disable-grant-options

into  olga.mysql.com:/home/igor/mysql-5.0-opt


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

into  mysql.com:/d2/hf/mr10/my50-mr10

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25302

into  mysql.com:/home/hf/work/mysql-5.1-mrg

  Removed line accidently inserted when correcting bug#18526


configure.in:
  Removed line accidently inserted when correcting bug#18526

into  mysql.com:/home/hf/work/mysql-5.1-mrg


sql/sql_partition.cc:
  Auto merged

into  mysql.com:/home/hf/work/mysql-5.1-mrg


storage/federated/ha_federated.cc:
  Auto merged

into  mysql.com:/d2/hf/mr10/my51-mr10


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

into  mysql.com:/d2/hf/mr10/my50-mr10

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


libmysql/libmysql.c:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/type_binary.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged
sql/mysqld.cc:
  manual merge
sql/sql_base.cc:
  manual merge