into mysql.com:/var/tmp/sslbug/mysql-4.1


include/my_global.h:
  Auto merged

BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.


include/my_global.h:
  Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003).
  This patch fixes compilation failures with both OpenSSL and yaSSL on systems where
  crypt was defined in unistd.h.
  Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in
  unistd.h/crypt.h and it was defined in old OpenSSL.

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

check table->file->inited to catch incorrect calling sequence.


mysql-test/r/innodb_handler.result:
  bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
mysql-test/t/innodb_handler.test:
  bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
sql/sql_handler.cc:
  cleanup: call index_init *correctly*, not every time.
  check table->file->inited to catch incorrect calling sequence.

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

into rurik.mysql.com:/home/igor/mysql-4.1

  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.


sql/sql_class.cc:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_1general.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_2myisam.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_3innodb.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_4heap.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_5merge.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.

BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged

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

Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server


myisam/mi_key.c:
  Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
myisam/mi_rnext_same.c:
  Fixed wrong arguments to ha_key_cmp()
  This caused a compare to fail if we first found a key with end space and then same key without end space
mysql-test/r/ctype_utf8.result:
  Additional test
mysql-test/t/ctype_utf8.test:
  Additional test

  Removed an extra space char.


sql/item_buff.cc:
  Removed an extra space char.

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

  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB field.
  Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
  Added a test case for bug #11088.


mysql-test/r/group_by.result:
  Added a test case for bug #11088.
mysql-test/t/group_by.test:
  Added a test case for bug #11088.
sql/item.h:
  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB fields.
  Now the size of the buffer is limited by max_sort_length.
sql/item_buff.cc:
  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB fields.
  Now the size of the buffer is limited by max_sort_length.
sql/sql_select.cc:
  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB fields.
  Now the size of the buffer is limited by max_sort_length.

into mysql.com:/space/my/mysql-4.1

into  mysql.com:/Users/emurphy/src/work/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

produces invalid query results

mi_key.c:
  well_formed_length should be executed before space trimming, not after.
ctype_utf8.test:
ctype_utf8.result:
  adding test.


myisam/mi_key.c:
  Bug#10253: ompound index length and utf8 char set produces invalid query results
  well_formed_length should be executed before space trimming, not after.
mysql-test/r/ctype_utf8.result:
  adding test.
  adding test.
mysql-test/t/ctype_utf8.test:
  adding test.

  when doing "make install" (they are not needed/useful) outside the build tree. Added
  "mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)


scripts/Makefile.am:
  - no need to install "make_win_src_distribution" and "make_win_binary_distribution"
    in "make install" (BUG#10676)
support-files/mysql.spec.sh:
  - added mysql_client_test to the "bench" subpackage (BUG 10676)
  - use "mysqldatadir" variable instead of hard-coding the path multiple times
  - use the "mysqld_user" variable on all occasions a user name is referenced
  - removed (incomplete) Brazilian translations
  - removed redundant release tags from the subpackage descriptions

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

BitKeeper/etc/ignore:
  Added scripts/mysqlhotcopy.sh.rej to the ignore list
scripts/mysqlhotcopy.sh:
  BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
  that --record-log-pos option will work with all versions from 3.23
  forward and will not break again in the future if additional columns
  are added.

  Adding test.
ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.


strings/ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.
mysql-test/t/ctype_cp1250_ch.test:
  Adding test.
mysql-test/r/ctype_cp1250_ch.result:
  Adding test.

into mysql.com:/Users/mikron/bug10901


BitKeeper/etc/logging_ok:
  auto-union

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

BUILD/check-cpu:
  fix for powerpc linux

  Try kill all children to the mysql-test-run process when exiting
mtr_process.pl:
  Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
mysql-test-run.pl:
  Try kill all children to the mysql-test-run process when exiting
  New --vardir caused problems on Windows
  Changed faulty calls to error() to mtr_error()


mysql-test/mysql-test-run.pl:
  Try kill all children to the mysql-test-run process when exiting
  New --vardir caused problems on Windows
  Changed faulty calls to error() to mtr_error()
mysql-test/lib/mtr_report.pl:
  Try kill all children to the mysql-test-run process when exiting
mysql-test/lib/mtr_process.pl:
  Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
mysql-test/lib/mtr_misc.pl:
  Try kill all children to the mysql-test-run process when exiting

'#pragma interface' (that comes with the #include'd header file)

Add test coverage for SHOW WARNINGS LIMIT a, b;


mysql-test/r/warnings.result:
  Add test coverage for SHOW WARNINGS LIMIT a,b
mysql-test/t/warnings.test:
  Add test coverage for SHOW WARNINGS LIMIT a,b
sql/sql_error.cc:
  Fix show warnings limit 0 and show warnings limit 0, 0

BUG#9826  Server crash on schema change ("drop table", "alter table") with NDB

See note on 10948 for detailed explanation.

struct a { void* a; long long b[1]; };

on PPC32 (and 32bit pa risc): 16
on x86: 12

so a malloc(sizeof(void*)+extra_bits) is wrong.

Assuming that the long long is 64 bit aligned as non-aligned 64bit accesses
are rather expensive on ppc.

Thanks to paulus for doing the PPC port of valgrind.
Without which I would no doubt still be trying to find this.


ndb/src/ndbapi/DictCache.cpp:
  Fix allocation size for Ndb_local_table_info for architectures such as PPC and PA-RISC (32bit)
  where
  struct a { void* a; long long b;};
  is 64 bit aligned (i.e. sizeof(struct a)==16)
ndb/src/ndbapi/DictCache.hpp:
  Add warning about having to be the last member in the structure

sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

After review fix
Copy from internal state to share state only when in lock write
mode (happens only when lock table x write has been performed since
update_state_info is only called when holding a TL_READ_NO_INSERT
lock normally. Previous patch would have failed in combination with
delayed writes.

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

Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable


mysql-test/r/func_gconcat.result:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/r/innodb.result:
  Moved test here form func_gconcat
mysql-test/r/olap.result:
  New test results after optimization
mysql-test/t/func_gconcat.test:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/t/innodb.test:
  Moved test here form func_gconcat
sql/field.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_berkeley.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_blackhole.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_heap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_innodb.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_ndbcluster.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/handler.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/hash_filo.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_cmpfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_func.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Ensure that 'null_value' is not accessed before val() is called
sql/item_geofunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_strfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_subselect.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_sum.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_timefunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_uniq.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/log_event.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/mysql_priv.h:
  Change key_map_full to not be const as we are giving it a proper value on startup
sql/mysqld.cc:
  Move key_map variables here and initialize key_map_full properly
sql/opt_range.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/opt_range.h:
  Fix that test_quick_select() works with any ammount of keys
sql/procedure.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol_cursor.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/set_var.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_analyse.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_class.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_crypt.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_insert.cc:
  Fixed that max_rows is ulong
sql/sql_list.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_map.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_olap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_select.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Fixed that ROLLUP don't have to always create a temporary table
  Added new argument to remove_const() to make above possible
  Fixed some errors that creapt up when we don't always do a temporary table for ROLLUP
sql/sql_string.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_table.cc:
  Simple optimizations
  Fixed wrong checking of build_table_path() in undef-ed code
sql/sql_udf.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_yacc.yy:
  removed extra {}

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/create.result:
  merged, need fixing
sql/sql_parse.cc:
  merged (perhaps wrong)

Analyze table corrupts the state on
data_file_length, records, index_file_length...
by writing the shared state when there is an updated internal
state due to inserts or deletes
Fixed by synching the shared state with the internal state before
writing it to disk
Added test cases of 2 error cases and a normal case in new
analyze test case


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure