into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

commit. (Bug #10840)


client/mysql.cc:
  Add cast of unsigned value stored in signed char

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

INSERT ... SELECT with UNION" (reviewed version).

Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.


mysql-test/r/ps.result:
  Added test case for bug #11060 "Server crashes on re-execution of
  prepared INSERT ... SELECT with UNION".
mysql-test/t/ps.test:
  Added test case for bug #11060 "Server crashes on re-execution of
  prepared INSERT ... SELECT with UNION".
sql/sql_insert.cc:
  select_insert::prepare():
    Item::fix_fields() methods operate assuming that LEX::current_select
    points to the select to which current item belongs. Thus
    during check_insert_fields() routine execution LEX::current_select
    should point ot the first select in query since this is the
    select with which items in insert list is associated.
    But if we have INSERT SELECT UNION SELECT type of query
    LEX::current_select will point to the fake_select_lex instead
    since select_insert::prepare() is called during processing of JOIN
    which corresponds to this select_lex.
    So we have set LEX::current_select before calling check_insert_fields()
    and restore it afterwards.

  Use the Perl version of mysql-test-run


Makefile.am:
  Use the Perl version of mysql-test-run

  Corrected path to 'mysql_fix_privilege_tables'


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'

  Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1

  remove typecheck in ndb handler not needed


sql/ha_ndbcluster.cc:
  remove typecheck in ndb handler not needed

ndb/src/kernel/SimBlockList.cpp:
  GCC 4.0 build fix

  Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases


mysql-test/lib/mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test/mysql-test-run.pl:
  Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

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

which the query contained more words than we allocated space. (Bug #7858)


myisam/ft_boolean_search.c:
  Fix calculation of max number of elements -- "words" may not have spaces
  between them.
mysql-test/t/fulltext.test:
  Modify test to be specific to reported bug (fix for old bug wasn't quite enough)
mysql-test/r/fulltext.result:
  Update results

  fixed 64bit bug in lenght store/retrive in cache


sql/sql_select.cc:
  fixed 64bit bug in lenght store/retrive in cache

Bug#8367 "low log doesn't gives complete information about prepared 
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in 
mysqltest.


mysql-test/r/ps_grant.result:
  Now execute is logged with tag 'Execute' (changed result file).
sql/mysql_priv.h:
  - remove obsolete macro.
  - add declarations for new status variables.
  - export function log_slow_statement, which now is used in sql_prepare.cc
sql/mysqld.cc:
  Add status variables for prepared statements API: now we record
  mysql_stmt_close, mysql_stmt_reset, mysql_stmt_prepare, mysql_stmt_execute
  mysql_stmt_send_long_data, PREPARE, EXECUTE, DEALLOCATE.
sql/sql_parse.cc:
  - account DEALLOCATE prepare as a Com_stmt_close command (close of a
  prepared statement).
sql/sql_prepare.cc:
  - fix a bug in SQL syntax for prepared statements + logging:
    if we use --log and EXECUTE stmt USING @no_such_variable;, the
    server crashed because the old code assumed that the variable 
    returned by get_var_with_binlog is never NULL.
  - account statistics for 
    mysql_stmt_{prepare,execute,close,reset,send_long_data} in
    Com_stmt_{prepare,execute,close,reset,send_long_data} correspondingly.
  - log slow statements into the slow log early, when thd->query
    points to a valid (with expanded placeholder values) query.
    The previous version was logging it in sql_parse, when thd->query
    is empty. Prevent the server from logging the statement twice by 
    setting thd->enable_slow_log= FALSE.
  - now in case of EXECUTE stmt in SQL syntax for prepared statements the 
    general log gets two queries, e.g.
    Query    EXECUTE stmt USING @A, @b, @c
    Execute  INSERT INTO t1 VALUES (1, 2, 3)
    This makes the behavior consistent with PREPARE command, which
    also logs the statement twice.

ALTER, OPTIMIZE and ANALYZE statements".
In 4.1 we disabled logging of slow admin statements. The fix adds an 
option to enable it back.
No test case (slow log is not tested in the test suite), but tested
manually.
+ post-review fixes (word police mainly).


sql/mysql_priv.h:
  - declaration for a new option
sql/mysqld.cc:
  Add server option '--log-slow-admin-statements' to log slow
  optimize/alter/etc statements to the slow log if it's enabled.
  Add warnings that this option works only if the slow log is open.
sql/sql_class.h:
  Rename 'thd->slow_command' to thd->enable_slow_log (negates
  the meaning of this variable, and so resolves the need to negate
  value opt_log_slow_admin_statements when setting it).
sql/sql_parse.cc:
  Implement optional logging of administrative statements in the slow log.

Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication


client/mysqltest.c:
  WL#2067: Added if(...) construct to mysqltest
mysql-test/include/rpl_stmt_seq.inc:
  Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
mysql-test/r/rpl_ddl.result:
  Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
mysql-test/t/rpl_ddl.test:
  Comment

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

into mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132

mysql-test/r/bdb_cache.result:
  fix test results
mysql-test/t/bdb_cache.test:
  fix test results

portability alignment issues.

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
configuration (and if we did, we would have to have calls to check the connection and
reconnect if needed - in case the mgm server had restarted) so we can disconnect after
first use.

This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Disconnect from management server after configuration is fetched.

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into mysql.com:/export/space/pekka/ndb/version/my41

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Correction for test case of bug #11142.


mysql-test/t/func_if.test:
  Correction for test case of bug #11142.
mysql-test/r/func_if.result:
  Correction for test case of bug #11142.

  Added a test case for bug #11142.
item_cmpfunc.cc:
  Fixed bug #11142.
  Implementation of Item_func_nullif::is_null was corrected.


sql/item_cmpfunc.cc:
  Fixed bug #11142.
  Implementation of Item_func_nullif::is_null was corrected.
mysql-test/t/func_if.test:
  Added a test case for bug #11142.
mysql-test/r/func_if.result:
  Added a test case for bug #11142.

  Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout


ndb/test/ndbapi/testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  valgrind fixes
ndb/test/ndbapi/testBlobs.cpp:
  valgrind fixes

  Added a test case for bug #11167.
sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes


sql/sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes
mysql-test/r/ctype_utf8.result:
  Added a test case for bug #11167.
mysql-test/t/ctype_utf8.test:
  Added a test case for bug #11167.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/bk/b6883-mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1-push

into mysql.com:/home/jonas/src/mysql-4.1-push