into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


libmysql/CMakeLists.txt:
  merge fix

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new

  Removed space between '-D' and symbol


CMakeLists.txt:
  Removed space between '-D' and symbol

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new


BitKeeper/deleted/.del-README~1:
  SCCS merged
BitKeeper/deleted/.del-configure.js:
  ul
dbug/CMakeLists.txt:
  SCCS merged
extra/CMakeLists.txt:
  SCCS merged
extra/yassl/CMakeLists.txt:
  SCCS merged
extra/yassl/taocrypt/CMakeLists.txt:
  SCCS merged
scripts/CMakeLists.txt:
  SCCS merged
server-tools/instance-manager/CMakeLists.txt:
  SCCS merged
sql/CMakeLists.txt:
  SCCS merged
storage/myisam/CMakeLists.txt:
  SCCS merged

sql/table.cc:
  do not attempt to set no_replicate if OPEN_FRM_FILE_ONLY was set

  Several adjustments to make client libraries pass the link test
  on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)


win/README:
  - Removed references to PARTITION engine, 5.1 only
win/configure.js:
  - Removed references to PARTITION engine, 5.1 only
extra/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
myisam/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
scripts/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
server-tools/instance-manager/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
sql/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
mysys/CMakeLists.txt:
  Restored include path to "mysys" itself
dbug/CMakeLists.txt:
  Changed to optionally be included to give a file list only
extra/yassl/CMakeLists.txt:
  Changed to optionally be included to give a file list only
extra/yassl/taocrypt/CMakeLists.txt:
  Changed to optionally be included to give a file list only
zlib/CMakeLists.txt:
  Changed to optionally be included to give a file list only
libmysql/CMakeLists.txt:
  For compatibility with Visual Studio 2005, list all files that are to
  be part of the library build, i.e. libraries can't be built from other
  libraries. Set SOURCE_SUBLIBS and include the file listings from
  "zlib", "dbug", "taocrypt" and "yassl"

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/mysql.h:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_parse.cc:
  merge fix
sql/sql_select.cc:
  merge fix

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines


sql/sql_insert.cc:
  Auto merged

client/CMakeLists.txt:
  add mysqlslap back in for 5.1

we need a copy of I_S name because the name can be changed in case of lowercase_table_name!=0

into  trift2.:/MySQL/M51/cmake-5.1

they got lost because of a merge conflict with the CMakeLists.txt 
dependency fix (numer 29982 in our bugs DB).

These changes are for bug#30118.


client/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)
libmysql/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)
mysys/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)
sql/CMakeLists.txt:
  Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1
zlib/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)

  Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-1
README.txt:
  Rename: BitKeeper/deleted/.del-README.txt -> mysql-test/suite/funcs_1/README.txt
README.txt-old-delete:
  Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-old-delete
README.txt:
  Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt
.del-README.txt-old-delete:
  Delete: mysql-test/suite/funcs_1/README.txt-old-delete


BitKeeper/deleted/.del-README.txt-old-delete:
  Delete: mysql-test/suite/funcs_1/README.txt-old-delete
mysql-test/suite/funcs_1/README.txt:
  Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt

into  trift2.:/MySQL/M51/push-5.1

Moved duplicated code to inline function store_timestamp()
Save thd->time_zone_used when logging to table as CSV internally cases it to be changed
Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
Set TABLE->no_replicate on open



client/mysqlbinlog.cc:
  Fixed several memory leaks (most in case of error situations)
mysql-test/r/events_logs_tests.result:
  Made long_query_timeout smaller to ensure next query comes into log
mysql-test/r/variables.result:
  Make it safe to run test with --log
mysql-test/t/events_logs_tests.test:
  Made long_query_timeout smaller to ensure next query comes into log
mysql-test/t/variables.test:
  Make it safe to run test with --log
sql/field.cc:
  Moved duplicated code to inline function store_timestamp()
sql/field.h:
  Moved duplicated code to inline function store_timestamp()
sql/handler.cc:
  Reorder checks in likely order
  Simplify checks if we should do binary logging
  (no_replicate is set once and for all when table is opened)
sql/log.cc:
  Save thd->time_zone_used as CVS internally cases it to be changed
  Use Field_timestamp->store_timestamp instead of automatic timestamps.
  This gives us correct timestamp even if thd->set_time() is not called (in case
  of connect) and we don't have to store thd->query_start_used anymore.
sql/sql_base.cc:
  Removed not needed comment
  Moved LINT_INIT() to after declaration
  Renamed temporary variable to avoid compiler warning
  Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
  Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
sql/table.cc:
  Set TABLE->no_replicate on open

client/mysqldump.c:
  table type compare is changed to case insensitive
mysql-test/r/information_schema.result:
  test result
mysql-test/r/information_schema_db.result:
  result fix
mysql-test/suite/ndb/r/ndb_alter_table.result:
  result fix
mysql-test/suite/ndb/r/ndb_temporary.result:
  result fix
mysql-test/t/information_schema.test:
  test case
sql/ha_ndbcluster.cc:
  char* variables are changed to LEX_STRING
sql/ha_ndbcluster.h:
  char* variables are changed to LEX_STRING
sql/ha_ndbcluster_binlog.cc:
  char* variables are changed to LEX_STRING
sql/handler.cc:
  char* variables are changed to LEX_STRING
sql/handler.h:
  char* variables are changed to LEX_STRING
sql/sql_base.cc:
  Modified functions which are used during open table process
  according to table opening method and requested_object.
sql/sql_select.cc:
  Add support for I_S tables into select_describe() function
sql/sql_show.cc:
  1. Added initialization of 'open_method' to 'st_field_info' structs.
  2. Added initialization of 'i_s_requested_object' to 'ST_SCHEMA_TABLE' structs.
  3. New function which calculates database name and table name values 
     from 'where' condition if it's possible
     void get_lookup_field_values(THD *thd, COND *cond, TABLE_LIST *table,
                                  LOOKUP_FIELD_VALUES *lookup_field_vals);
  4. New function which set table open method
     setup_table_open_method(TABLE_LIST *tables,
                             ST_SCHEMA_TABLE *schema_table,
                             enum enum_schema_tables schema_table_idx)
  5. New function
     int make_db_list(THD *thd, List<LEX_STRING> *files,
                      LOOKUP_FIELD_VALUES *lookup_field_vals,
                      bool *with_i_schema)
  6. New function
     int make_table_name_list(THD *thd, List<LEX_STRING> *files, LEX *lex,
                              LOOKUP_FIELD_VALUES *lookup_field_vals,
                              bool with_i_schema, LEX_STRING *db_name)
  7. Modified 'get_all_tables' function according to new schema(see wl#3732).
sql/sql_show.h:
  char* variables are changed to LEX_STRING
sql/table.cc:
  Modified functions which are used during open table process
  according to table opening method and requested_object.
sql/table.h:
  1. added new constants(open_method)
  #define SKIP_OPEN_TABLE 0
  #define OPEN_FRM_ONLY   1
  #define OPEN_FULL_TABLE 2
      
  2. Added new field 'open_method' into struct st_field_info;
     uint open_method;
      
  3. Added new field into ST_SCHEMA_TABLE struct
     uint i_s_requested_object;  /* the object we need to open(TABLE | VIEW) */.
  4. Added new field to TABLE_LIST struct.
     uint i_s_requested_object;
     This field is set from ST_SCHEMA_TABLE.i_s_requested_object
     for processed table before opening.
      
  5. Added new fields to TABLE_LIST struct, used for 'explain select' for I_S table
     bool has_db_lookup_value;
     bool has_table_lookup_value;
     uint table_open_method;
sql/unireg.h:
  added new constants

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M41/push-4.1

    
Manual transfer of the fix for bug#20815 from 5.0 to 5.1


CMakeLists.txt:
  Limit stack size of the server to 1 MB.
  
  Manual transfer of the fix for bug#20815 from 5.0 to 5.1

into  trift2.:/MySQL/M51/push-5.1


sql/CMakeLists.txt:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0


sql/CMakeLists.txt:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


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

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~ef945345:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01:
  Auto merged
dbug/CMakeLists.txt:
  Auto merged
tests/CMakeLists.txt:
  Auto merged
zlib/CMakeLists.txt:
  Auto merged
client/CMakeLists.txt:
  Will be re-applied using "patch".
libmysql/CMakeLists.txt:
  Will be re-applied using "patch".
mysys/CMakeLists.txt:
  Will be re-applied using "patch".
sql/CMakeLists.txt:
  Will be re-applied using "patch".

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~5:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged

  Simplified copying of 'mysql-test' directory


scripts/make_win_bin_dist:
  Simplified copying of 'mysql-test' directory

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~fc201a06:
  Auto merged
CMakeLists.txt:
  Auto merged
tests/CMakeLists.txt:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


sql/sql_parse.cc:
  Auto merged

into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-5.0


myisam/myisamchk.c:
  Auto merged

into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1

  Fix typo in usage.


myisam/myisamchk.c:
  Fix typo in usage.

into  chilla.local:/home/mydev/mysql-5.1-bug29838

into  mysql.com:/home/svoj/devel/mysql/BUG29152/mysql-5.1-engines


sql/sql_insert.cc:
  Auto merged

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build

  Add CMakeLists.txt to source distribution
CMakeLists.txt:
  Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1
  Manual merge from 5.0 (bug#30118)
CMakeLists.txt, mysqlbinlog.cc, lib_sql.cc:
  No need to test on USING_CMAKE, it is the only Windows build


client/mysqlbinlog.cc:
  No need to test on USING_CMAKE, it is the only Windows build
libmysqld/CMakeLists.txt:
  No need to test on USING_CMAKE, it is the only Windows build
libmysqld/lib_sql.cc:
  No need to test on USING_CMAKE, it is the only Windows build
libmysqld/Makefile.am:
  Add CMakeLists.txt to source distribution
libmysqld/examples/Makefile.am:
  Add CMakeLists.txt to source distribution
sql/CMakeLists.txt:
  Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1
client/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)
libmysql/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)
mysys/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)
zlib/CMakeLists.txt:
  Manual merge from 5.0 (bug#30118)

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


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