- 25 Apr, 2007 1 commit
-
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/r/alter_table.result: Auto merged mysql-test/t/alter_table.test: Auto merged sql/sql_table.cc: Auto merged
-
- 24 Apr, 2007 24 commits
-
-
unknown authored
- Use the 25141 fix. - 26074 is duplicate, as 25141 has more comprehensive test mysql-test/r/windows.result: - Removed duplicate results. mysql-test/t/windows.test: - Removed InnoDB requirement. - Removed duplicate test case. sql/ha_partition.cc: - Reverted changes from bug 26074 because it conflicts with bug 25141.
-
unknown authored
BitKeeper/deleted/.del-partition.inc: Delete: mysql-test/include/partition.inc
-
unknown authored
BitKeeper/deleted/.del-partition_not_windows.test: Exclude BitKeeper/deleted/.del-partition_windows.result: Exclude BitKeeper/deleted/.del-partition_windows.test: Exclude mysql-test/include/partition.inc: Exclude sql/sql_table.cc: Exclude
-
unknown authored
into alf.:D:/src/mysql-5.1-maint_pt
-
unknown authored
scripts/CMakeLists.txt: Fix broken bk native builds. sql/log_event_old.cc: Fix for failing DBUG builds.
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint include/m_ctype.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/Makefile.am: Manual merge
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint include/my_global.h: Auto merged include/my_sys.h: Auto merged
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/r/grant.result: Auto merged mysql-test/t/grant.test: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint client/mysql.cc: Auto merged include/my_global.h: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/mysql_upgrade.test: Auto merged mysql-test/t/sp.test: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint include/my_global.h: Auto merged
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint scripts/mysql_system_tables_fix.sql: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_udf.cc: Auto merged
-
unknown authored
into mysql.com:/home/ram/work/b27515/b27515.5.0 mysql-test/r/grant.result: Auto merged mysql-test/t/grant.test: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/home/ram/work/b27515/b27515.5.1 mysql-test/t/grant.test: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/grant.result: will be merged in a post-merge CS
-
unknown authored
-
unknown authored
into mysql.com:/home/ram/work/b27515/b27515.5.0 mysql-test/r/grant.result: will be merged in a post-merge CS mysql-test/t/grant.test: manual merge sql/sql_parse.cc: manual merge
-
unknown authored
into alf.:D:/src/mysql-5.1-maint_pt sql/sql_table.cc: Auto merged BitKeeper/deleted/.del-partition_windows.result: Delete: mysql-test/r/partition_windows.result BitKeeper/deleted/.del-partition_not_windows.test: Delete: mysql-test/t/partition_not_windows.test BitKeeper/deleted/.del-partition_windows.test: Delete: mysql-test/t/partition_windows.test
-
unknown authored
into recycle.(none):/src/bug24732/my50-bug24732
-
unknown authored
-
unknown authored
into recycle.(none):/src/bug24732/my51-bug24732 BitKeeper/deleted/.del-Makefile.am~2: Auto merged
-
unknown authored
- Correct PushBuild failure. win/Makefile.am: Bug#24732 Executables do not include Vista manifests - Make sure new files are included in make dist builds.
-
- 23 Apr, 2007 15 commits
-
-
unknown authored
into recycle.(none):/src/mysql-5.1-maint_25141 sql/sql_table.cc: Auto merged
-
unknown authored
into recycle.(none):/src/mysql-5.1-maint_27691
-
unknown authored
- Added appropiate casts. sql/log_event.cc: Bug #27691 bk compilation with VC++ 2005 fails - Add appropiate casts.
-
unknown authored
into recycle.(none):/src/bug24732/my50-bug24732
-
unknown authored
into recycle.(none):/src/bug24732/my51-bug24732
-
unknown authored
- Post merge cleanup. CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Added logic for EMBED_MANIFESTS configuration option. client/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for client executables. extra/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for my_print_default executable. libmysql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myTest executable. server-tools/instance-manager/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqlmanager executable. sql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqld executable. storage/myisam/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myisam executables. win/README: Bug#24732 Executables do not include Vista manifests - Added new configuration option documentation. win/configure.js: Bug#24732 Executables do not include Vista manifests - Added new EMBED_MANIFESTS configuration option.
-
unknown authored
into recycle.(none):/src/bug24732/my51-bug24732 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~10: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~13: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~3: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~7: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740: Auto merged BitKeeper/deleted/.del-README~1: Auto merged BitKeeper/deleted/.del-configure.js: Auto merged
-
unknown authored
- Added script to generate application specific manifest. - Added new CMake MACRO to add customer build events which will first generate a manifest and then embeds that manifest into an executable. BitKeeper/etc/ignore: Bug#24732 Executables do not include Vista manifests - Revise ignore rules to disallow auto-generated cmake files but to allow custom macros defined in a .cmake file. CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Added logic for EMBED_MANIFESTS configuration option. client/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for client executables. extra/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for my_print_default executable. libmysql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myTest executable. myisam/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for myisam executables. server-tools/instance-manager/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqlmanager executable. sql/CMakeLists.txt: Bug#24732 Executables do not include Vista manifests - Embed manifest with custom CMake MACRO for mysqld executable. win/README: Bug#24732 Executables do not include Vista manifests - Added new configuration option documentation. win/configure.js: Bug#24732 Executables do not include Vista manifests - Added new EMBED_MANIFESTS configuration option. win/create_manifest.js: Bug#24732 Executables do not include Vista manifests - Manifest generator. This script generates a basic manifest. win/mysql_manifest.cmake: Bug#24732 Executables do not include Vista manifests - Define new CMake MACRO for adding Windows manifests to executables.
-
unknown authored
Fix minor merge "oopsie" mysql-test/t/mysql_upgrade.test: Fix minor merge "oopsie"
-
unknown authored
into recycle.(none):/src/bug25621/my50-bug25621 sql/mysqld.cc: Auto merged
-
unknown authored
into recycle.(none):/src/bug25621/my51-bug25621 sql/mysqld.cc: Auto merged
-
unknown authored
into recycle.(none):/src/bug25621/my51-bug25621 sql/mysqld.cc: Auto merged
-
unknown authored
- On Windows, connection handlers while exiting properly did not decrement the server's thread count. sql/mysqld.cc: Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit - Make sure that connection handlers decrement number of threads and handlers on Windows. - Signal condition variable before unlocking mutex.
-
unknown authored
- The function build_table_filename() builds up a string unconditionally using the forward slash as a path separator. Later, when the string is searched for FN_LIBCHAR by the set_up_table_before_create() function, a null pointer is returned that is finally used by strlen in the append_file_to_dir() function which causes the crash. mysql-test/r/partition.result: Bug#25141 Crash Server on Partitioning command - Updated results mysql-test/t/partition.test: Bug#25141 Crash Server on Partitioning command - Enable test on Windows. - Move failing Windows tests to partition_not_winodws test sql/sql_table.cc: Bug#25141 Crash Server on Partitioning command - Use OS specific path separator when building table_filename mysql-test/r/partition_not_windows.result: Bug#25141 Crash Server on Partitioning command - Non-Windows results. mysql-test/r/partition_windows.result: Bug#25141 Crash Server on Partitioning command - Windows specific tests mysql-test/t/partition_not_windows.test: Bug#25141 Crash Server on Partitioning command - Non-Windows specific partition tests mysql-test/t/partition_windows.test: Bug#25141 Crash Server on Partitioning command - Windows specific partition tests.
-
unknown authored
-
