- Send error to client when mysql_change_db fails.


sql/sql_db.cc:
  Added a note to comment for mysql_change_db that it will not send any error to the client.
sql/sql_parse.cc:
  Call net_send_error(thd) if mysql_change_db fails.
  Remove comments claiming that mysql_change_db sends error the the client.

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

    correct result after bugfix
sql/sql_class.cc
    initialize net.query_cache_query


mysql-test/r/flush_block_commit.result:
  correct result after bugfix
sql/sql_class.cc:
  initialize net.query_cache_query
sql/sql_yacc.yy:
  oops

sql/field.h:
  Field_bit_as_char::size_of() added - we use it in the ::new_key_field().
sql/sql_table.cc:
  We have to set pack_flag for bit fields in the mysql_prepare_table()
  as we use it in the create_length_to_internal_length().

into mysql.com:/home/pem/work/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

mysql-test/r/flush_block_commit.result:
  FLUSH TABLES WITH READ LOCK should block writes to binlog too
  it does not yet
mysql-test/t/flush_block_commit.test:
  FLUSH TABLES WITH READ LOCK should block writes to binlog too
  it does not yet

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

sql/field.cc:
  We have to use memcmp() here to get determinate results.
sql/sql_table.cc:
  Should set pack_flag here instead of doing |=

mysql-test/r/sp.result:
  Added test case for BUG#7185.
mysql-test/t/sp.test:
  Added test case for BUG#7185.
sql/sql_yacc.yy:
  Allow non-reserved words as stored procedure names.

                when CREATE but not when ALTER


sql/sql_parse.cc:
  Return more consistent error message for alter/drop procedure/function
  when no current database and no qualified name.

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


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

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

 - If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
 - Added one more record to the tables for heap test and expoect "range" to be selected
 - Decrease number of records in t1 for range and expect "index" to be choosen.


mysql-test/r/heap.result:
  Add one more record to table t1 and expect explain to use "range"
mysql-test/r/heap_btree.result:
  Add one more record to table t1 and expect explain to use "range"
mysql-test/r/heap_hash.result:
  Add one more record to table t1 and expect explain to use "range"
mysql-test/r/range.result:
  Update results
mysql-test/t/heap.test:
  Add one more record to table t1 and expect explain to use "range"
mysql-test/t/heap_btree.test:
  Add one more record to table t1 and expect explain to use "range"
mysql-test/t/heap_hash.test:
  Add one more record to table t1 in order for optimizer to select use of "range" deterministic
mysql-test/t/range.test:
  Remove one record from table t1 to avoid that cost for "index" and "range" are so close that rounding error become visible.

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


sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

return an error

configure.in:
  Auto merged
sql/share/Makefile.am:
  all-local instead of all

because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).



sql/share/Makefile.am:
  using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
  all-local is the standard way to add something to all: (thanks Konstantin)
configure.in:
  Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )

sql/sql_table.cc:
  merge

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).


sql/sql_table.cc:
  When optimizing a table, if we fall back to mysql_alter_table()
  (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
  is not supposed to do any binlogging (it is done by the caller).

into mdk10.(none):/home/reggie/bk/mysql-5.0


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

into mdk10.(none):/home/reggie/bk/mysql-4.1

into mysql.com:/home/cps/mysql/trees/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/instance.cc:
  fix username used for monitoring purposes to make logging more verbose

server-tools/instance-manager/commands.cc:
  check pointer for null before using it

server-tools/instance-manager/options.cc:
  remove [mysql] group from the list of the groups read by the mysqlmanager (resulted from wrong merge long ago)

into mysql.com:/usr/home/bar/mysql-5.0

ndb/include/ndbapi/NdbScanOperation.hpp:
  release scan op early to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
  release scan op early to save memory
ndb/src/ndbapi/NdbTransaction.cpp:
  release scan op early to save memory
ndb/src/ndbapi/Ndblist.cpp:
  release scan op early to save memory
sql/ha_ndbcluster.cc:
  release scan op early to save memory

mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

config/ac-macros/character_sets.m4:
  In 4.1, this was in "configure.in" with this comment:
      Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
      However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
      In order to do custom builds without manual patches, this value gets special handling in 'configure'.
      Also, when it is given, the CPP symbol enabling the additional code is set.

configure.in:
  No change here - functionality was moved to 'config/ac-macros/character_sets.m4'
mysys/charset-def.c:
  Auto-merged.
strings/ctype-utf8.c:
  Auto-merged.

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

function" into 4.1 tree.

into mysql.com:/home/dlenev/src/mysql-4.1-merges


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

function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.


mysql-test/r/query_cache.result:
  Let us test that queries with CURRENT_USER() function are not cached.
mysql-test/t/query_cache.test:
  Let us test that queries with CURRENT_USER() function are not cached.
sql/item_create.cc:
  create_func_current_user():
    We should not cache queries which use CURRENT_USER() function.