into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/sql_show.cc:
  Auto merged

configure.in:
  adjust version number after 5.0.48 clone-off

 - "mysql" and "mysqlcheck" should not read defaults file


client/mysql_upgrade.c:
  Instruct "mysql" and "mysqlcheck" that is invoked by "mysql_upgrade" not
  to read defaults file, they should get all the parameters they need from
  mysql_upgrade(that read the default file)

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release

 - Chop off .libs/ part of path if running in non installed builddir
   using libtool


client/mysql_upgrade.c:
  Chop off .libs part of path to avoid executing "non relinked" binaries
  that would use the system installed dynamic libraries instead of the
  newly built ones.

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel

into  trift2.:/MySQL/M50/push-5.0


netware/Makefile.am:
  Auto merged

1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.


netware/BUILD/compile-netware-END:
  Ensure the "*.def" files are built for NetWare.
  
  This is a backport of a 5.1 fix which may not be needed in 5.0 but cannot do any harm:
  the general "link_sources" step might fall victim to a cleanup which would be fatal
  just for NetWare, because of problems in the ordering of SUBDIR entries.
netware/Makefile.am:
  1) The scripts "init_db.sql" and "test_db.sql" must be built in the NetWare phase.
  
  2) Use "basename", not sed.

'mtr_short_hostname' and 'mtr_full_hostname'

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release


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

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

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt


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

 - Move increment of "i" to "increment section" of for loop
 - Protect against writing after end of "buff"(backport from 5.1)


sql/sql_show.cc:
  - Move the increment of i to "increment" section of for loop. Since "i"
  was initially 0 the for loop exited immediately
  - Add protection for writing after end of "buff"

into  trift2.:/MySQL/M50/push-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48


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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48

1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
   so we do not need the ".def" files for the "isam"-specific tools.

2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.


BitKeeper/deleted/.del-isamchk.def:
  Delete: netware/isamchk.def
BitKeeper/deleted/.del-isamlog.def:
  Delete: netware/isamlog.def
BitKeeper/deleted/.del-pack_isam.def:
  Delete: netware/pack_isam.def
netware/Makefile.am:
  Use a plain "basename" showing the purpose, not a sed command which is harder to read.

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

into  hynda.mysql.fi:/home/my/mysql-5.0-marvel

Killing a SELECT query with KILL QUERY or KILL CONNECTION
causes a server crash if the query cache is enabled.

Normal evaluation of a query may be interrupted by the
KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
function returns TRUE, and the thd->killed flag has true value.
In this case the result of the query may
be cached incompletely (omitting call to query_cache_insert inside
the net_real_write function), and next call to query_cache_end_of_result
may lead to server crash.
Thus, the query_cache_end_of_result function has been modified to abort
query cache in the case of killed thread.



sql/sql_cache.cc:
  Fixed bug #30201.
  The  query_cache_end_of_result function has been modified to abort query
  cache in the case of query execution failure. Also this function has been
  modified to remove incomplete query block.

into  trift2.:/MySQL/M50/push-5.0

into  hynda.mysql.fi:/home/my/mysql-5.0-marvel

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

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime


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

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


sql/sql_select.cc:
  Auto merged

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

Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
  
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions. 

Views are excepted and can be cached but only retrieved by super user account.


mysql-test/t/query_cache_with_views.test:
  Rename: mysql-test/t/view_query_cache.test -> mysql-test/t/query_cache_with_views.test
mysql-test/r/query_cache_with_views.result:
  Rename: mysql-test/r/view_query_cache.result -> mysql-test/r/query_cache_with_views.result
mysql-test/r/query_cache.result:
  Modified test case to allow caching of views
mysql-test/t/query_cache.test:
  Modified test case to allow caching of views
sql/sql_cache.cc:
  Allow caching of views

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


sql/sql_base.cc:
  Auto merged

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

The server created temporary tables for filesort in the working directory
instead of the specified tmpdir directory.


sql/item.cc:
  Fixed bug #30287.
  The Item_field::set_field method has been modified to reset the any_privileges
  flag to false in case of system temporary table. This modification prevents the
  server from unnecessary checking of user privileges to access system temporary
  tables.
sql/sql_select.cc:
  Fixed bug #30287.
  Bugfix for #29015 has been removed: TABLE_SHARE::table_name of system
  temporary tables contains full path to table file basename again.
sql/sql_view.cc:
  Fixed bug #30287.
  Commentary has been added.

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


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

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