into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895


sql/sql_select.cc:
  Manual merge.

In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.


sql/sql_select.cc:
  In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
mysql-test/r/long_tmpdir.result:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir-master.opt:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir-master.sh:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir.test:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"

This is to fix PB failures introduced by the patch for bug #28895.


mysql-test/r/view_grant.result:
  Fixed tests that relied on broken behavior in acl_getroot_no_password().

into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895


mysql-test/r/view_grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.


mysql-test/r/view_grant.result:
  Fixed the testcase for bug #14875 which relied on broken behavior. sctx->master_access and sctx->priv_user were being set to the last entry in the acl_users list. That does not happen after the patch for bug #28895, so we get a different warning message.
sql/sql_acl.cc:
  In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.

into  amd64.(none):/src/bug24400/my51-bug24400

into  amd64.(none):/src/bug24400/my51-bug24400


BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged

into  amd64.(none):/src/bug24400/my50-bug24400


VC++Files/sql/mysqld.dsp:
  Auto merged

mysql-test/r/innodb_mysql.result:
  result adjusted.

into  mysql.com:/home/ram/work/b28652/b28652.5.1


mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
sql/sql_table.cc:
  manual merge

into  amd64.(none):/src/bug24732/my51-bug24732

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged

into  amd64.(none):/src/bug24732/my51-bug24732


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

- Cleanup typo.
- Make sure to only embedded four part numberic version.


CMakeLists.txt:
  Bug #24732 Executables do not include Vista manifests
  - Correct typo in manifest detection logic.
win/create_manifest.js:
  Bug #24732 Executables do not include Vista manifests
  - Remove -* from the end of version string before embedding
  into manifest.

Problem: we may create a deadlock committing changes in the mysql_alter_table() when 
LOCK_open is set. Moreover, "in some variants of the ALTER TABLE commit
happens earlier, outside of LOCK_open, in other later - inside. It's no good, a storage 
engine code that is called in between could expect a consistency - either there is a 
transaction or there is not".
Fix: move the commit to happen earlier and outside of the LOCK_open.


mysql-test/r/innodb_mysql.result:
  Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
    - test result.
mysql-test/t/innodb_mysql.test:
  Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
    - test case.
sql/sql_table.cc:
  Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
    - commit moved to happen earlier in the mysql_alter_table(), 
      now we commit changes at the same time as in case when a temporary 
      table is used.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


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

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


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

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


sql/sql_select.cc:
  Auto merged
strings/strtod.c:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


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

 - Removed the global variable(s) glob_use_running_cluster/slave
   and put a property on each "cluster" called "use_running" which
   is set to 1 if user passed either ndb_connectstring or 
   ndb_connectstring_slave. Thus mtr.pl should not start/stop the
   cluster.


mysql-test/lib/mtr_process.pl:
  Removed the global variable(s) glob_use_running_cluster/slave
  and put a property on each "cluster" called "use_running" which
  is set to 1 if user passed either ndb_connectstring or 
  ndb_connectstring_slave. Thus mtr.pl should not start/stop the
  cluster
mysql-test/mysql-test-run.pl:
  Removed the global variable(s) glob_use_running_cluster/slave
  and put a property on each "cluster" called "use_running" which
  is set to 1 if user passed either ndb_connectstring or 
  ndb_connectstring_slave. Thus mtr.pl should not start/stop the
  cluster

only one of those is allowed

into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497


mysql-test/t/grant.test:
  Auto merged
mysql-test/t/rpl_packet.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

 - Add funtion "query_get_value to allow reading a fields value
   into a $variable


client/mysqltest.c:
  - Add function "let $var= query_get_value(<query>,<colname>,<row>)"
    making it possible to read a value from a specific field in a query 
    into a $variable.
mysql-test/r/mysqltest.result:
  Add test cases for "query_get_value"
mysql-test/t/mysqltest.test:
  Add test cases for "query_get_value"

 - Update tests to be independent how the mysqld was started


mysql-test/r/mysqltest.result:
  Update result file
mysql-test/t/mysqltest.test:
  The purpose of these three test is to check that "sync_with_master"
  detects illegal parameters, the parameter checking is done before
  sending any command to the server and the "save_master_pos" can be
  removed in two cases to make the tests independent of mysqld.
  The thirs test is removed since it's a syntax check that is done
  after the command has been executed and is done for all comands in
  mysqltest - it's tested elsewhere and is not specific to "sync_with_master"

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug #27643.


mysql-test/r/ctype_ucs2_def.result:
  Corrected the error messages for 5.1
mysql-test/r/heap_hash.result:
  Corrected the error messages for 5.1
mysql-test/t/ctype_ucs2_def.test:
  Corrected the error codes for 5.1.
mysql-test/t/heap_hash.test:
  Corrected the error codes for 5.1.

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


sql/sql_select.cc:
  Auto merged

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/sql_select.cc:
  Auto merged