Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.


configure.in:
  To configure InnoDB for cross compilation.
include/config-netware.h:
  NetWare specific change to fix the compilation errors caused by event.h
  NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
  and zlib(1.2.3)
netware/BUILD/compile-AUTOTOOLS:
  Netware specific change reflecting the change in source code
  directory structure.
netware/BUILD/compile-linux-tools:
  Netware specific change to fix the location where gen_lex_hash
  gets created. Fixed also directory structure reflecting changes.
netware/BUILD/compile-netware-END:
  Netware specific change for creating mysqld_error.h
netware/BUILD/mwenv:
  Netware specific change required for WINE PATH and for
  new versions LibC(Jun 05) and zlib(1.2.3).
netware/BUILD/nwbootstrap:
  NetWare Specific change to produce absoulte path for XDC file.
netware/Makefile.am:
  Netware specific changes to fix to match new
  directory structure.
netware/my_manage.h:
  Netware specific change required for WINE PATH and for new versions
  LibC(Jun 05) and zlib(1.2.3).
  ((I fail to understand the above comment for this change - 
  seems just to be a number alignment and a "#define NULL".  Joerg))
netware/mysql_test_run.c:
  Netware specific change, added --autoclose option for mysql_test_run.nlm.
sql/mysqld.cc:
  Stacksize change for Netware.
  Netware specific change to fix the compilation errors caused by event.h
sql/set_var.cc:
  Minor indending related fix.
sql/sql_class.cc:
  Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
storage/innobase/os/os0thread.c:
  Netware specific change to increase the thread stack size.
storage/myisam/mi_locking.c:
  Enclosed MMAP related code under HAVE_MMAP preprocessor directive.

storage/innobase/include/univ.i  :  Get rid of "extern inline" (part of innodb-5.0-149/162 snapshots).


storage/innobase/include/univ.i:
  Part of innodb-5.0-149/162 snapshots:
  Avoid breaking --with-debug builds on QNX and other systems
  whose compiler pretends to be GCC 2.
  Outside __WIN__ define UNIV_INLINE as static inline.

  Link with CLIENT_EXTRA_LDFLAGS, enable us to
  pass on libtool flags '-full-static' and '-static'
  using '--with-client-ldflags' to configure.
mysql.spec.sh:
  Pass '-static' to libtool, link static with our
  own libraries, dynamic with system libraries.
  Link with the bundled zlib.


support-files/mysql.spec.sh:
  Pass '-static' to libtool, link static with our
  own libraries, dynamic with system libraries.
  Link with the bundled zlib.
server-tools/instance-manager/Makefile.am:
  Link with CLIENT_EXTRA_LDFLAGS, enable us to
  pass on libtool flags '-full-static' and '-static'
  using '--with-client-ldflags' to configure.

storage/ndb/src/kernel/blocks/Makefile.am:
  Fix proposed by Jonas Oreland: Stop building "ndb_print_file", it is just for testing.
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Fix proposed by Jonas Oreland: Stop building "test_varpage", it is just for testing.

into  perch.ndb.mysql.com:/home/jonas/tmp/mysql-5.1-release

storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  reopen wo/ O_DIRECT if firts write fails

  Bug#17196, --default-storage-engine option broken
configure.in:
  This is an alpha


configure.in:
  This is an alpha
sql/sql_plugin.cc:
  Bug#17196, --default-storage-engine option broken

scripts/make_binary_distribution.sh:
  As of 5.1, any package will contain both an optimized and a debugging server,
  built with identical configuration (features / table handlers).
  This "mysqld-debug" must be contained in the package.
  Also, the server will not be stripped any more.
  Also, get rid of the old compatibility symlink "safe_mysqld" dating back to 4.0.

into mysql.com:/M51/clone-5.1

Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani.


scripts/make_binary_distribution.sh:
  Adaption of the 5.1.6 build clone to the new "storage" directory layer,
  already done in the general tree by Jani:
      2006/02/02 16:22:22+02:00 jani@ua141d10.elisa.omakaista.fi +2 -2
      Fix to reflect change in directory structure.

into  mysql.com:/usr/local/mysql/mysql-5.1-release

sql/sql_show.cc:
  Add cast for Windows.

into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug


mysql-test/mysql-test-run.pl:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

sql/mysql_priv.h:
  remove reference to variable removed in the previous patch

for the log tables.


sql/mysqld.cc:
  post-review fixes

sql/field.cc:
  Use memmove() instead of memcpy() -- after implementation of WL#2984
  (Make stored routine variables work according to the standard) it is
  possible to store in the field the value from this field. For instance,
  this can happen for the following statement:
    SET sp_var = SUBSTR(sp_var, 1, 3);
sql/sp_head.cc:
  Work correctly with String:
  - String length has to be be reset before use;
  - qs_append() does not allocate memory, so the memory should
    be reserved beforehand.

    Copied from the general tree, to solve a build problem:
    ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
      build fix when building with example storage engine.


storage/example/ha_example.cc:
  Copied from the general tree, to solve a build problem:
  ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
    build fix when building with example storage engine.

into  mysql.com:/home/dlenev/src/mysql-5.1-bfix

privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.


mysql-test/r/system_mysql_db.result:
  Updated test results after addition of TRIGGER privilege.
mysql-test/t/disabled.def:
  Enabled back test system_mysql_db/system_mysql_db_fix tests.
scripts/mysql_fix_privilege_tables.sql:
  Corrected addition of TRIGGER privilege.

mysql-test/r/ndb_dd_dump.result:
  New BitKeeper file ``mysql-test/r/ndb_dd_dump.result''
mysql-test/t/ndb_dd_dump.test:
  New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''

When we add new privilege we should update mysql-test/lib/init_db.sql
accordingly.


mysql-test/lib/init_db.sql:
  Added TRIGGER privilege.
sql/sql_acl.h:
  Updated comment describing process of addition of new privileges - added yet
  another script place which should be modified when new privilege is added.

into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge

into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge


mysql-test/r/information_schema.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

fix up test cases.


mysql-test/r/information_schema.result:
  update result for INFORMATION_SCHEMA.FILES
mysql-test/r/information_schema_db.result:
  update result for INFORMATION_SCHEMA.FILES
sql/ha_ndbcluster.cc:
  in fill_files_table, use my_snprintf instead of snprintf
sql/sql_show.cc:
  correct DBUG_ENTER for fill_schema_files
sql/table.h:
  add SCH_FILES to information schema enum

into  poseidon.ndb.mysql.com:/home/tomas/mysql51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

corrected test case

correction