Table handlers "bdb" and "myisam" (and others) have been moved into a common subdirectory "storage".

Include paths between main projects and table handler files need to be adapted.


VC++Files/libmysqld/libmysqld.dsp:
  Table handler "bdb" has been moved into a subdirectory "storage",
  so the path to the include files must reflect this.
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/myisamchk/myisamchk.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/myisamchk/myisamchk_ia64.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/myisamlog/myisamlog.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/myisamlog/myisamlog_ia64.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/myisampack/myisampack.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/myisampack/myisampack_ia64.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the include and source files must reflect this.
VC++Files/sql/mysqld_ia64.dsp:
  Table handler "bdb" has been moved into a subdirectory "storage",
  so the path to the include files must reflect this.

Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".

This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.


VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
  mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
  mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
  mvdir
VC++Files/mysql.dsw:
  Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
  have been moved into a common subdirectory "storage".
  This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
  Table handlers "heap", "innobase", "myisam", and "myisammrg"
  have been moved into a common subdirectory "storage".
  This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
  Table handler "bdb" has been moved into a subdirectory "storage".
  File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
  Table handler "bdb" has been moved into a subdirectory "storage",
  so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
  Table handler "heap" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
  Table handler "heap" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
  Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
  have been moved into a common subdirectory "storage".
  This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
  Table handler "innobase" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
  Table handler "innobase" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
  Table handler "myisammrg" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
  Table handler "myisammrg" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


include/my_sys.h:
  Auto merged
include/thr_lock.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqldump.c:
  Manual merge
include/mysql.h:
  Manual merge
libmysql/libmysql.c:
  Manual merge
myisam/rt_split.c:
  Manual merge
mysys/thr_lock.c:
  Manual merge
sql/lock.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
tests/mysql_client_test.c:
  Manual merge

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1


include/thr_lock.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Manual merge after 4.0 fix

sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

sql/lock.cc:
  Used flags immediately in call
sql/mysql_priv.h:
  Added RTFC (short for remove_table_from_cache)
  for constants and used hex syntax to clarify it is bits
  in the flags
sql/sql_base.cc:
  Use flags parameter immediately and use flags immediately in call
  Change to other variant of eternal loop variant
sql/sql_table.cc:
  Use flags immediately in call

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

sql/field.cc:
  Fix type of temporary variables for handling result of
  number_to_datetime().

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

- do not discover temporary files and make them visible

This push includes the clone tag.


configure.in:
  Upgraded the version number, as 5.0.10 is cloned off.

cursors. This should fix Bug#11813 when InnoDB part is in 
(tested with a draft patch).
The idea of the patch is that if a storage engine supports
consistent read views, we open one when open a cursor,
set is as the active view when fetch from the cursor, and close
together with cursor close.


sql/examples/ha_archive.cc:
  - extend handlerton with cursors methods; fix coding style
sql/examples/ha_example.cc:
  - extend handlerton with cursors methods; fix coding style
sql/examples/ha_tina.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_berkeley.cc:
  - extend handlerton with cursors methods
sql/ha_blackhole.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_federated.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_heap.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_innodb.cc:
  - extend handlerton with cursors methods
sql/ha_myisam.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_myisammrg.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_ndbcluster.cc:
  - extend handlerton with cursors methods
sql/handler.h:
  - extend handlerton with cursors methods
sql/sql_select.cc:
  - create a consistent read view when we open a cursor,
    set it for a fetch, and free when we closing the cursor.
sql/sql_select.h:
  - add Cursor::ht_info to remember read views used in a cursor.
tests/mysql_client_test.c:
  Disable an assert that will be no longer valid when consistent
  read views in InnoDB are used.

mysql-test/r/partition_list.result:
  missed in last push

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/field.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
  Auto merged
strings/ctype-big5.c:
  Auto merged

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


tests/mysql_client_test.c:
  Auto merged

client/mysqldump.c:
  Added casts.
include/my_sys.h:
  Define for alloca() changed for Metrowerks compiler.
myisam/rt_split.c:
  Added cast.

sql/field.cc:
  Fix warnings/compilation failures.

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

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


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged

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

into  mysql.com:/usr/home/bar/mysql-4.1.innolike

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
BitKeeper/deleted/.del-var~62c955ccf2da1a21:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged

mysql-test/r/strict.result:
  Fix results file

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

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


libmysql/libmysql.c:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/strict.result:
  Resolve conflict
mysql-test/t/strict.test:
  Resolve conflict

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


sql/sql_parse.cc:
  Auto merged

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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into moonbone.local:/work/mysql-5.0-bug-11760


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

by subtime() in view

Item_func_add_time::print() were printing arg[0] instead of arg[1] which
results in wrongly created view. Functions addtime() and subtime were
affected by this bug.


sql/item_timefunc.cc:
  Fix bug #11760 Typo in Item_func_add_time::print() results in wrongly created view
mysql-test/t/view.test:
  Test case for bug #11760  Typo in Item_func_add_time::print() results in wrongly created view
mysql-test/r/view.result:
  Test case for bug #11760  Typo in Item_func_add_time::print() results in wrongly created view
mysql-test/r/date_formats.result:
  Fixed wrong test result. Affected by bug#11760

mysql-test/r/ps_1general.result:
  Update results
mysql-test/r/ps_2myisam.result:
  Update results
mysql-test/r/ps_3innodb.result:
  Update results
mysql-test/r/ps_4heap.result:
  Update results
mysql-test/r/ps_5merge.result:
  Update results
mysql-test/r/ps_6bdb.result:
  Update results
mysql-test/r/ps_7ndb.result:
  Update results
mysql-test/r/select.result:
  Update results
mysql-test/t/disabled.def:
  Disable ndb_condition_pushdown test
mysql-test/t/select.test:
  Fix bad merge
sql/field_conv.cc:
  Update name of warning message
sql/mysqld.cc:
  Set proper thd->killed
tests/mysql_client_test.c:
  Update test cases, change verify_prepared_field() help function
  so it is passed the filename and line from where it is called
  and includes that in the error message.

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

into  mysql.com:/data0/emurphy/src/mysql-5.0