into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

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

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into moonbone.local:/work/tmp_merge-4.1-opt-mysql

This bug in Field_string::cmp resulted in a wrong comparison 
with keys in partial indexes over multi-byte character fields.
Given field a is declared as a varchar(16) collate utf8_unicode_ci
INDEX(a(4)) gives us an example of such an index.
  
Wrong key comparisons could lead to wrong result sets if 
the selected query execution plan used a range scan by 
a partial index over a utf8 character field.
This also caused wrong results in many other cases.


mysql-test/t/ctype_utf8.test:
  Added test cases for bug #14896.
mysql-test/r/ctype_utf8.result:
  Added test cases for bug #14896.
sql/field.cc:
  Fixed bug #14896.
  This bug in Field_string::cmp resulted in a wrong comparison 
  with keys in partial indexes over multi-byte character fields.
  Given field a is declared as a varchar(16) collate utf8_unicode_ci
  INDEX(a(4)) gives us an example of such an index.
       
  Wrong key comparisons could lead to wrong result sets if 
  the selected query execution plan used a range scan by 
  a partial index over a utf8 character field.
  This also caused wrong results in many other cases.

into  mysql.com:/home/bk/fix-mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

include/my_libwrap.h:
  Changed includes to the header file.
mysys/my_libwrap.c:
  Added comment and .c file now takes needed includes from
  the corresponding .h file.
sql/mysqld.cc:
  Include this block from my_libwra.h now.
  Moved two variables out of the otherwise
  same block.

into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1


sql/opt_sum.cc:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged

            functions in queries

Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.

The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.

This patch skips disabled indexes for min/max optimization.


mysql-test/r/myisam.result:
  Test case for BUG#20357.
mysql-test/t/myisam.test:
  Test case for BUG#20357.
sql/opt_sum.cc:
  Skip disabled/ignored indexes for min/max optimization.

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

into  mysql.com:/data0/knielsen/mysql-5.0

Backport Valgrind suppression from mysql-5.1:

D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
P mysql-test/valgrind.supp
C Remove warning that may happens becasue threads dies in different order


mysql-test/valgrind.supp:
  Add suppression for Valgrind warning.

into  mysql.com:/home/kgeorge/mysql/5.0/B18080


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/marty/MySQL/mysql-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

mysql-test/t/insert_select.test:
  Auto merged
mysql-test/r/insert_select.result:
  manual merge

mysql-test/r/view_grant.result:
  merged
mysql-test/t/view_grant.test:
  merged

into  mysql.com:/home/kgeorge/mysql/5.0/B20482


sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

            schemas
The function check_one_table_access() called to check access to tables in 
SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
in the context of setup_tables_and_check_access().
That's why the check_one_table() was split into two : the functionality needed by
setup_tables_and_check_access() into check_single_table_access() and the rest of 
the functionality stays in check_one_table_access() that is made to call the new
check_single_table_access() function.


mysql-test/r/view_grant.result:
  Bug #20482: failure on Create join view with sources views/tables in different 
              schemas
  - test suite for the bug
mysql-test/t/view_grant.test:
  Bug #20482: failure on Create join view with sources views/tables in different 
              schemas
  - test suite for the bug
sql/mysql_priv.h:
  Bug #20482: failure on Create join view with sources views/tables in different 
              schemas
  - check_one_table_access split into 2
sql/sql_base.cc:
  Bug #20482: failure on Create join view with sources views/tables in different 
              schemas
  - the new sub-function called
sql/sql_parse.cc:
  Bug #20482: failure on Create join view with sources views/tables in different 
              schemas
  - check_one_table_access() split into two : check_single_table_access() to 
    actually check access to the table(ro) and check_one_table_access() that calls
    check_single_table_access() and checks also the tables belonging to sub selects
    or implicitly opened tables.

into  mysql.com:/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into  mysql.com:/usr/home/ram/work/mysql-5.0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

sql/mysqld.cc:
  Fix for Bug#18246 "compilation error with tcp_wrapper"
  
  Added wrapper functions.

into moonbone.local:/work/tmp_merge-5.0-opt-mysql


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

  Additional fix for #16377 for bigendian platforms
sql_select.cc, select.result, select.test:
  After merge fix


mysql-test/t/select.test:
  After merge fix
mysql-test/r/select.result:
  After merge fix
sql/sql_select.cc:
  After merge fix
sql/field.h:
  Additional fix for #16377 for bigendian platforms
sql/field.cc:
  Additional fix for #16377 for bigendian platforms

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.


support-files/mysql.server.sh:
  Support getting additional arguments, which need to be passed on to the server.
  This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
  So if the IM would be used, additional arguments cause the start to fail (voluntarily).
  
  This feature is needed so that tools like RPM can start the server in an "isolated" way,
  see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".
support-files/mysql.spec.sh:
  Call "mysql_upgrade" during an RPM upgrade.
  
  "mysql_upgrade" needs a server to run, as it issues SQL commands.
  (This had been neglected previously.)
  It also needs to connect as "root", but in an RPM upgrade the password is unknown.
  To allow this, the server is started "--skip-grant-tables".
  Normally, this would open big security holes, so it is also started "--skip-networking",
  and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.

into moonbone.local:/work/tmp_merge-4.1-opt-mysql