DATA_VARMYSQL so remove unnecessary condition.

  Check that there is a disabled.def before using it
disabled.def:
  Reenable ndb tests accidently disabled


mysql-test/t/disabled.def:
  Reenable ndb tests accidently disabled
mysql-test/mysql-test-run.sh:
  Check that there is a disabled.def before using it

  calc_row_difference(): Use non-inlined functions to avoid linking error.


sql/ha_innodb.cc:
  calc_row_difference(): Use non-inlined functions to avoid linking error.

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

BitKeeper/etc/ignore:
  Added VC++Files/client/mysql_amd64.dsp to the ignore list

  InnoDB true VARCHAR


sql/ha_innodb.h:
  InnoDB true VARCHAR
sql/ha_innodb.cc:
  InnoDB true VARCHAR
innobase/include/data0type.h:
  InnoDB true VARCHAR
innobase/include/que0que.h:
  InnoDB true VARCHAR
innobase/include/row0mysql.h:
  InnoDB true VARCHAR
innobase/include/data0type.ic:
  InnoDB true VARCHAR
innobase/include/row0mysql.ic:
  InnoDB true VARCHAR
innobase/row/row0ins.c:
  InnoDB true VARCHAR
innobase/row/row0mysql.c:
  InnoDB true VARCHAR
innobase/row/row0sel.c:
  InnoDB true VARCHAR
innobase/trx/trx0trx.c:
  InnoDB true VARCHAR

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

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


sql/sql_show.cc:
  Auto merged

sql_show.cc:
  changed strdup to thd->memdup per Serg's advice


sql/sql_show.cc:
  changed strdup to thd->memdup per Serg's advice

into mysql.com:/home/cps/mysql/devel/im-fix-review

Alter RPM to include mysqlmanger binary and config files.


support-files/mysql.server.sh:
  mysql start/stop script altered to use mysqlmanager instead of mysqld_safe, novel 'reload' option
  was temporarily removed
support-files/mysql.spec.sh:
  correct RPM to include mysqlmanager

  Added feature to disable tests from a list in a file "disabled.def"
  Moved down the code that disables, so that --do-test and --start-from
  don't list the disabled tests not in range.
disabled.def:
  List of test cases to temporarely disable


mysql-test/t/disabled.def:
  List of test cases to temporarely disable
mysql-test/mysql-test-run.sh:
  Added feature to disable tests from a list in a file "disabled.def"
  Moved down the code that disables, so that --do-test and --start-from
  don't list the disabled tests not in range.

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


BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
sql/sql_show.cc:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union

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

This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.


sql/sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
client/mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660

    define _XOPEN_SOURCE=500 for solaris
include/my_sys.h
    remove a cast


include/my_global.h:
  define _XOPEN_SOURCE=500 for solaris
include/my_sys.h:
  remove a cast

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

heap/hp_create.c:
  Auto merged
sql/filesort.cc:
  Auto merged
mysql-test/r/heap.result:
  manual merging
mysql-test/t/heap.test:
  manual merging
sql/ha_heap.cc:
  manual merging

sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Manual merge

-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.


mysql-test/r/ndb_cache2.result:
  Updated test cases for the ndb_util thread, more simultaneous tables and more tesst
mysql-test/t/ndb_cache2.test:
  Updated test cases for the ndb_util thread, more simultaneous tables and more advanced tesst
sql/ha_ndbcluster.cc:
  Add table changed during transaction to list of changed tables in Thd_ndb, this list is then used in ndbcluster_commit to invalidate the cached commit_count in share
  Fix so that ndb_util_thread uses milliseconds "sleeps"
  Changed so that ndb_commit_count uses the commit_count from share if available
sql/ha_ndbcluster.h:
  Add commit_count_lock to NBD_SHARE, use for detecting simultaneous attempts to update commit_count
  Add list of tables changed by transaction to Thd_ndb
  Change check_ndb_connection to take thd as argument, use current_thd as default
  Added m_rows_changed variable to keep track of if this handler has modified any records within the transaction
sql/set_var.cc:
  Change format of code
  Sort sys__ variables in aplha order

into hundin.mysql.fi:/home/marko/mysql-4.1

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

into hundin.mysql.fi:/home/marko/mysql-5.0

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

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

sql/filesort.cc:
  A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).              
  Should call ha_rnd_end() only if ha_rnd_init() was called.

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


support-files/mysql.server.sh:
  Auto merged

  "mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)


Build-tools/Do-solaris-pkg:
  - fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
    (thanks to Kent for the suggestion)

Applied some changes to the mysql.server init script that are already shipped as an additional patch
in the 4.1.10a RPMs for SLES9/RHEL3:

- small improvement: use LSB functions to display startup success and failure, if available.
  Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)


support-files/mysql.server.sh:
  - small improvement: use LSB functions to display startup success and failure, if available.
    Fall back to builtin functions otherwise.
  - joined two pieces of code performing the same functionality into one "wait_for_pid" function
  - added a "reload" function (LSB requirement)

into mysql.com:/space/pekka/ndb/version/my50

ndb/src/common/transporter/Transporter.cpp:
  missing return

at function level.


ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Avoid compilation error: On IRIX, variables declared within a loop control statement
  seem to have function scope. Either use different identifiers, or declare them
  at function level.

into mysql.com:/usr/home/ram/work/4.1.b8799

into mysql.com:/M50/mysql-5.0

  dict_load_table(): Remove unused label that was accidentally introduced
  in a 4.0->4.1->5.0 merge.


innobase/dict/dict0load.c:
  dict_load_table(): Remove unused label that was accidentally introduced
  in a 4.0->4.1->5.0 merge.