List:Commits« Previous MessageNext Message »
From:Sunanda Menon Date:November 11 2010 3:41pm
Subject:bzr push into mysql-5.5-bugteam branch (sunanda.menon:3121)
View as plain text  
 3121 Sunanda Menon	2010-11-11 [merge]
      merge

    removed:
      mysql-test/suite/ibmdb2i/
      mysql-test/suite/ibmdb2i/include/
      mysql-test/suite/ibmdb2i/include/have_i54.inc
      mysql-test/suite/ibmdb2i/include/have_i61.inc
      mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc
      mysql-test/suite/ibmdb2i/r/
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result
      mysql-test/suite/ibmdb2i/t/
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test
      storage/ibmdb2i/
      storage/ibmdb2i/CMakeLists.txt
      storage/ibmdb2i/Makefile.am
      storage/ibmdb2i/db2i_blobCollection.cc
      storage/ibmdb2i/db2i_blobCollection.h
      storage/ibmdb2i/db2i_charsetSupport.cc
      storage/ibmdb2i/db2i_charsetSupport.h
      storage/ibmdb2i/db2i_collationSupport.cc
      storage/ibmdb2i/db2i_collationSupport.h
      storage/ibmdb2i/db2i_constraints.cc
      storage/ibmdb2i/db2i_conversion.cc
      storage/ibmdb2i/db2i_errors.cc
      storage/ibmdb2i/db2i_errors.h
      storage/ibmdb2i/db2i_file.cc
      storage/ibmdb2i/db2i_file.h
      storage/ibmdb2i/db2i_global.h
      storage/ibmdb2i/db2i_iconv.h
      storage/ibmdb2i/db2i_ileBridge.cc
      storage/ibmdb2i/db2i_ileBridge.h
      storage/ibmdb2i/db2i_ioBuffers.cc
      storage/ibmdb2i/db2i_ioBuffers.h
      storage/ibmdb2i/db2i_misc.h
      storage/ibmdb2i/db2i_myconv.cc
      storage/ibmdb2i/db2i_myconv.h
      storage/ibmdb2i/db2i_rir.cc
      storage/ibmdb2i/db2i_safeString.h
      storage/ibmdb2i/db2i_sqlStatementStream.cc
      storage/ibmdb2i/db2i_sqlStatementStream.h
      storage/ibmdb2i/db2i_validatedPointer.h
      storage/ibmdb2i/ha_ibmdb2i.cc
      storage/ibmdb2i/ha_ibmdb2i.h
      storage/ibmdb2i/plug.in
    added:
      mysql-test/collections/mysql-5.5-bugteam.daily
      mysql-test/collections/mysql-5.5-bugteam.push
      mysql-test/std_data/bug57108.cnf
      mysql-test/suite/binlog/t/binlog_index-master.opt
      mysql-test/suite/bugs/r/bug57108.result
      mysql-test/suite/bugs/t/bug57108-master.opt
      mysql-test/suite/bugs/t/bug57108.test
      mysql-test/suite/rpl/t/rpl_bug33931-master.opt
      mysql-test/suite/rpl/t/rpl_current_user-master.opt
      mysql-test/suite/rpl/t/rpl_heartbeat-master.opt
      mysql-test/suite/rpl/t/rpl_ip_mix-master.opt
      mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt
      mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt
      mysql-test/suite/sys_vars/inc/autocommit_func2.inc
      mysql-test/suite/sys_vars/r/autocommit_func2.result
      mysql-test/suite/sys_vars/r/autocommit_func3.result
      mysql-test/suite/sys_vars/t/autocommit_func2-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func2.test
      mysql-test/suite/sys_vars/t/autocommit_func3-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func3.test
    modified:
      CMakeLists.txt
      cmake/install_layout.cmake
      config/ac-macros/maintainer.m4
      include/my_sys.h
      include/mysql/client_plugin.h
      libmysqld/lib_sql.cc
      mysql-test/collections/default.experimental
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/ctype_utf8.result
      mysql-test/r/errors.result
      mysql-test/r/keywords.result
      mysql-test/r/log_tables.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/subselect.result
      mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
      mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
      mysql-test/suite/perfschema/include/binlog_common.inc
      mysql-test/suite/perfschema/include/cleanup_helper.inc
      mysql-test/suite/perfschema/include/privilege.inc
      mysql-test/suite/perfschema/include/setup_helper.inc
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/r/aggregate.result
      mysql-test/suite/perfschema/r/binlog_mix.result
      mysql-test/suite/perfschema/r/binlog_row.result
      mysql-test/suite/perfschema/r/binlog_stmt.result
      mysql-test/suite/perfschema/r/checksum.result
      mysql-test/suite/perfschema/r/column_privilege.result
      mysql-test/suite/perfschema/r/ddl_cond_instances.result
      mysql-test/suite/perfschema/r/ddl_events_waits_current.result
      mysql-test/suite/perfschema/r/ddl_events_waits_history.result
      mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result
      mysql-test/suite/perfschema/r/ddl_ews_by_instance.result
      mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_file_instances.result
      mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_fs_by_instance.result
      mysql-test/suite/perfschema/r/ddl_mutex_instances.result
      mysql-test/suite/perfschema/r/ddl_performance_timers.result
      mysql-test/suite/perfschema/r/ddl_rwlock_instances.result
      mysql-test/suite/perfschema/r/ddl_setup_consumers.result
      mysql-test/suite/perfschema/r/ddl_setup_instruments.result
      mysql-test/suite/perfschema/r/ddl_setup_timers.result
      mysql-test/suite/perfschema/r/ddl_threads.result
      mysql-test/suite/perfschema/r/dml_cond_instances.result
      mysql-test/suite/perfschema/r/dml_events_waits_current.result
      mysql-test/suite/perfschema/r/dml_events_waits_history.result
      mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
      mysql-test/suite/perfschema/r/dml_ews_by_instance.result
      mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_instances.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
      mysql-test/suite/perfschema/r/dml_mutex_instances.result
      mysql-test/suite/perfschema/r/dml_performance_timers.result
      mysql-test/suite/perfschema/r/dml_rwlock_instances.result
      mysql-test/suite/perfschema/r/dml_setup_consumers.result
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      mysql-test/suite/perfschema/r/dml_setup_timers.result
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/func_mutex.result
      mysql-test/suite/perfschema/r/global_read_lock.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/r/myisam_file_io.result
      mysql-test/suite/perfschema/r/no_threads.result
      mysql-test/suite/perfschema/r/one_thread_per_con.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/privilege.result
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/r/read_only.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/selects.result
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/r/tampered_perfschema_table1.result
      mysql-test/suite/perfschema/t/aggregate.test
      mysql-test/suite/perfschema/t/checksum.test
      mysql-test/suite/perfschema/t/column_privilege.test
      mysql-test/suite/perfschema/t/ddl_cond_instances.test
      mysql-test/suite/perfschema/t/ddl_events_waits_current.test
      mysql-test/suite/perfschema/t/ddl_events_waits_history.test
      mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test
      mysql-test/suite/perfschema/t/ddl_ews_by_instance.test
      mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_file_instances.test
      mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_fs_by_instance.test
      mysql-test/suite/perfschema/t/ddl_mutex_instances.test
      mysql-test/suite/perfschema/t/ddl_performance_timers.test
      mysql-test/suite/perfschema/t/ddl_rwlock_instances.test
      mysql-test/suite/perfschema/t/ddl_setup_consumers.test
      mysql-test/suite/perfschema/t/ddl_setup_instruments.test
      mysql-test/suite/perfschema/t/ddl_setup_timers.test
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_cond_instances.test
      mysql-test/suite/perfschema/t/dml_events_waits_current.test
      mysql-test/suite/perfschema/t/dml_events_waits_history.test
      mysql-test/suite/perfschema/t/dml_events_waits_history_long.test
      mysql-test/suite/perfschema/t/dml_ews_by_instance.test
      mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_instances.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test
      mysql-test/suite/perfschema/t/dml_mutex_instances.test
      mysql-test/suite/perfschema/t/dml_performance_timers.test
      mysql-test/suite/perfschema/t/dml_rwlock_instances.test
      mysql-test/suite/perfschema/t/dml_setup_consumers.test
      mysql-test/suite/perfschema/t/dml_setup_instruments.test
      mysql-test/suite/perfschema/t/dml_setup_timers.test
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/func_file_io.test
      mysql-test/suite/perfschema/t/func_mutex.test
      mysql-test/suite/perfschema/t/global_read_lock.test
      mysql-test/suite/perfschema/t/information_schema.test
      mysql-test/suite/perfschema/t/misc.test
      mysql-test/suite/perfschema/t/myisam_file_io.test
      mysql-test/suite/perfschema/t/no_threads.test
      mysql-test/suite/perfschema/t/one_thread_per_con.test
      mysql-test/suite/perfschema/t/privilege.test
      mysql-test/suite/perfschema/t/query_cache.test
      mysql-test/suite/perfschema/t/read_only.test
      mysql-test/suite/perfschema/t/schema.test
      mysql-test/suite/perfschema/t/selects.test
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/suite/perfschema/t/start_server_no_cond_class.test
      mysql-test/suite/perfschema/t/start_server_no_cond_inst.test
      mysql-test/suite/perfschema/t/start_server_no_file_class.test
      mysql-test/suite/perfschema/t/start_server_no_file_inst.test
      mysql-test/suite/perfschema/t/start_server_no_mutex_class.test
      mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test
      mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test
      mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test
      mysql-test/suite/perfschema/t/start_server_no_thread_class.test
      mysql-test/suite/perfschema/t/start_server_no_thread_inst.test
      mysql-test/suite/perfschema/t/tampered_perfschema_table1.test
      mysql-test/suite/perfschema/t/thread_cache.test
      mysql-test/suite/rpl/r/rpl000017.result
      mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/t/rpl000017.test
      mysql-test/suite/rpl/t/rpl_cross_version-master.opt
      mysql-test/suite/rpl/t/rpl_ignore_table.test
      mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
      mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
      mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
      mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/suite/rpl/t/rpl_sync.test
      mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
      mysql-test/t/ctype_utf8.test
      mysql-test/t/errors.test
      mysql-test/t/key_cache-master.opt
      mysql-test/t/keywords.test
      mysql-test/t/log_tables.test
      mysql-test/t/mysqlbinlog-master.opt
      mysql-test/t/sp-bugs.test
      mysql-test/t/subselect.test
      mysql-test/t/union.test
      mysys/default.c
      mysys/stacktrace.c
      scripts/mysql_system_tables.sql
      sql-common/client.c
      sql/item_func.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/sp_head.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_rename.cc
      sql/sql_union.cc
      sql/sql_yacc.yy
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits_summary.cc
      storage/perfschema/table_ews_global_by_event_name.cc
      storage/perfschema/table_file_instances.cc
      storage/perfschema/table_file_summary.cc
      storage/perfschema/table_performance_timers.cc
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_timers.cc
      storage/perfschema/table_sync_instances.cc
      storage/perfschema/table_threads.cc
      strings/ctype-uca.c
=== modified file 'win/README'
--- a/win/README	2010-11-04 10:11:43 +0000
+++ b/win/README	2010-11-11 12:32:12 +0000
@@ -1,114 +1,8 @@
 Windows building readme
 ======================================
 
-----------------IMPORTANT----------------------------
-This readme outlines the instructions for building 
-MySQL for Windows staring from version 5.1.
-This readme does not apply to MySQL versions 5.0 
-or ealier.
------------------------------------------------------
-
 The Windows build system uses a tool named CMake to generate build files for
 a variety of project systems.  This tool is combined with a set of jscript
 files to enable building of MySQL for Windows directly out of a bzr clone.
-For relevant information, please refer to http://forge.mysql.com/wiki/CMake
-The steps required are below.
-
-Step 1:
--------
-
-Install a Windows C++ compiler.  If you don't have one, you can use
-the free compiler "Visual C++ 2005 express edition", which from Cmake
-point of view is same as Visual studio 8:
-http://msdn.microsoft.com/vstudio/express/
-
-Step 2
-------
-Download and install CMake.  It can be downloaded from http://www.cmake.org. 
-Once it is installed, modify your path to make sure you can execute
-the cmake binary.
-
-Step 3
-------
-Download and install bison for Windows.  It can be downloaded from
-http://gnuwin32.sourceforge.net/packages/bison.htm.  Please download using
-the link named "Complete package, excluding sources".  This includes an
-installer that will install bison.  After the installer finishes, modify
-your path so that you can execute bison.
-
-(As an alternative you can take the sql_yacc.yy and sql_yacc.h files from a
-matching mysql tar distribution and drop them into the sql directory just
-before you start the build)
-
-Step 4
-------
-One of the nice CMake features is "out-of-source" build support, which 
-means not building in the source directory, but in dedicated build 
-directory. This keeps the source directory clean and allows for more than 
-single build tree for the same source tree (e.g debug and release, 32 and 
-64 bit etc). We'll create subdirectory "bld" in the source directory for 
-this purpose. Clone your bzr tree to any location you like.
-
-Step 5
-------
-From the root of your installation directory use cmake . -L to see the 
-various configuration parameters.
-
-So the command line could look like:
-
-cmake .. -G "target" -DWITH_INNOBASE_STORAGE_ENGINE=1
-
-The recommended way of configuring would be to use -DBUILD_CONFIG=mysql_release
-to build binaries exactly the same as the official MySQL releases. 
-
-Step 6
-------
-
-From the root of your installation directory/bzr clone, you can
-use cmake to compile the sources.  Use cmake --help when necessary.
-Before you start building the sources, please remove the old build area
-created from an earlier run and start afresh.
-
-C:\> del bld 
-C:\> md bld 
-C:\> cd  bld 
-C:\> cmake .. -G "target name" -DBUILD_CONFIG=mysql_release
-
-
-For Example:
-To generate the Win64 project files using Visual Studio 9, you would run
-cmake .. -G "Visual Studio 9 2008 Win64" 
-
-Other target names supported using CMake 2.6 patch 4 are:
-
-  Visual Studio 7              "Visual Studio 7 .NET 2003"
-  Visual Studio 8              "Visual Studio 8 2005"
-  Visual Studio 8 (64 bit)     "Visual Studio 8 2005 Win64"
-  Visual Studio 9              "Visual Studio 9 2008"
-  Visual Studio 9 (64 bit)     "Visual Studio 9 2008 Win64"
-
-For generating project files using Visual Studio 10, you need CMake 2.8
-or higher and corresponding target names are
-  Visual Studio 10              "Visual Studio 10" 
-  Visual Studio 10 (64 bit)     "Visual Studio 10 Win64" 
- 
-Step 7
-------
-From the root of your bzr clone, start your build.
-
-For Visual Studio, execute mysql.sln.  This will start the IDE
-and you can click the build solution menu option.
-
-Alternatively, you could start the build from command line as follows
-
-devenv mysql.sln /build relwithdebinfo
- 
-Current issues
---------------
-1. After changing configuration (eg. adding or removing a storage engine), it
-may be necessary to clean the build tree to remove any stale objects.
-
-2. To use Visual C++ Express Edition you also need to install the Platform SDK.
-Please see this link: http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
-At step 5 you only need to add the libraries advapi32.lib and user32.lib to
-the file "corewin_express.vsprops" in order to avoid link errors.
+For relevant information and/or for building binaries from source distribution, 
+please refer to http://forge.mysql.com/wiki/CMake


Attachment: [text/bzr-bundle] bzr/sunanda.menon@oracle.com-20101111124413-8azr4wfa7in2lsc1.bundle
Thread
bzr push into mysql-5.5-bugteam branch (sunanda.menon:3121) Sunanda Menon11 Nov