From: Georgi Kodinov Date: November 18 2010 4:03pm Subject: bzr commit into mysql-5.1-bugteam branch (Georgi.Kodinov:3511) Bug#50021 List-Archive: http://lists.mysql.com/commits/124334 X-Bug: 50021 Message-Id: <201011181604.oAIG4SfX003520@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4808488603214468070==" --===============4808488603214468070== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/kgeorge/mysql/work/B50021-5.1-bugteam/ based on revid:vasil.dimov@stripped 3511 Georgi Kodinov 2010-11-18 Bug #50021: Windows standard configuration files are showing Linux options/settings 1. Changed the default value for socket on Windows to the windows default 2. Removed hard-coded trailing slashes from innodb_data_home_dir and innodb_log_group_name_dir. 3. Added extra backslashes to the innodb directory example 4. Made the tempdir platform "dependent" 5. Fixed the comments in the .ini files 6. Removed the tmpdir from the templates and the scripts modified: CMakeLists.txt support-files/my-huge.cnf.sh support-files/my-innodb-heavy-4G.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh support-files/my-small.cnf.sh win/configure.js === modified file 'CMakeLists.txt' --- a/CMakeLists.txt 2009-12-11 18:16:04 +0000 +++ b/CMakeLists.txt 2010-11-18 16:02:37 +0000 @@ -42,8 +42,7 @@ ADD_DEFINITIONS(-DSHAREDIR="share") # Set debug options SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS") - -SET(localstatedir "C:\\mysql\\data") +SET(localstatedir "C:\\\\mysql\\\\data\\\\") CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh ${CMAKE_SOURCE_DIR}/support-files/my-huge.ini @ONLY) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-innodb-heavy-4G.cnf.sh === modified file 'support-files/my-huge.cnf.sh' --- a/support-files/my-huge.cnf.sh 2009-03-31 14:04:01 +0000 +++ b/support-files/my-huge.cnf.sh 2010-11-18 16:02:37 +0000 @@ -3,11 +3,11 @@ # This is for a large system with memory of 1G-2G where the system runs mainly # MySQL. # -# You can copy this file to -# /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options (in this -# installation this directory is @localstatedir@) or -# ~/.my.cnf to set user-specific options. +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html # # In this file, you can use all long options that a program supports. # If you want to know which options a program supports, run the program @@ -113,14 +113,10 @@ server-id = 1 # binary logging format - mixed recommended #binlog_format=mixed -# Point the following paths to different dedicated disks -#tmpdir = /tmp/ -#log-update = /path-to-dedicated-directory/hostname - # Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = @localstatedir@/ +#innodb_data_home_dir = @localstatedir@ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend -#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high #innodb_buffer_pool_size = 384M === modified file 'support-files/my-innodb-heavy-4G.cnf.sh' --- a/support-files/my-innodb-heavy-4G.cnf.sh 2010-08-06 12:56:23 +0000 +++ b/support-files/my-innodb-heavy-4G.cnf.sh 2010-11-18 16:02:37 +0000 @@ -8,10 +8,11 @@ # running mostly MySQL using InnoDB only tables and performing complex # queries with few connections. # -# You can copy this file to /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options -# (@localstatedir@ for this installation) or to -# ~/.my.cnf to set user-specific options. +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html # # In this file, you can use all long options that a program supports. # If you want to know which options a program supports, run the program @@ -232,15 +233,6 @@ slow_query_log # currently measures time with second accuracy only). long_query_time = 2 -# The directory used by MySQL for storing temporary files. For example, -# it is used to perform disk based large sorts, as well as for internal -# and explicit temporary tables. It might be good to put it on a -# swapfs/tmpfs filesystem, if you do not create very large temporary -# files. Alternatively you can put it on dedicated disk. You can -# specify multiple paths here by separating them by ";" - they will then -# be used in a round-robin fashion. -#tmpdir = /tmp - # *** Replication related settings === modified file 'support-files/my-large.cnf.sh' --- a/support-files/my-large.cnf.sh 2009-03-31 14:04:01 +0000 +++ b/support-files/my-large.cnf.sh 2010-11-18 16:02:37 +0000 @@ -3,11 +3,11 @@ # This is for a large system with memory = 512M where the system runs mainly # MySQL. # -# You can copy this file to -# /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options (in this -# installation this directory is @localstatedir@) or -# ~/.my.cnf to set user-specific options. +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html # # In this file, you can use all long options that a program supports. # If you want to know which options a program supports, run the program @@ -113,14 +113,10 @@ server-id = 1 # binary logging - not required for slaves, but recommended #log-bin=mysql-bin -# Point the following paths to different dedicated disks -#tmpdir = /tmp/ -#log-update = /path-to-dedicated-directory/hostname - # Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = @localstatedir@/ +#innodb_data_home_dir = @localstatedir@ #innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high #innodb_buffer_pool_size = 256M === modified file 'support-files/my-medium.cnf.sh' --- a/support-files/my-medium.cnf.sh 2009-03-31 14:04:01 +0000 +++ b/support-files/my-medium.cnf.sh 2010-11-18 16:02:37 +0000 @@ -4,11 +4,11 @@ # an important part, or systems up to 128M where MySQL is used together with # other programs (such as a web server) # -# You can copy this file to -# /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options (in this -# installation this directory is @localstatedir@) or -# ~/.my.cnf to set user-specific options. +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html # # In this file, you can use all long options that a program supports. # If you want to know which options a program supports, run the program @@ -111,14 +111,10 @@ server-id = 1 # binary logging - not required for slaves, but recommended #log-bin=mysql-bin -# Point the following paths to different dedicated disks -#tmpdir = /tmp/ -#log-update = /path-to-dedicated-directory/hostname - # Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = @localstatedir@/ +#innodb_data_home_dir = @localstatedir@ #innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high #innodb_buffer_pool_size = 16M === modified file 'support-files/my-small.cnf.sh' --- a/support-files/my-small.cnf.sh 2009-03-31 14:04:01 +0000 +++ b/support-files/my-small.cnf.sh 2010-11-18 16:02:37 +0000 @@ -4,11 +4,11 @@ # from time to time and it's important that the mysqld daemon # doesn't use much resources. # -# You can copy this file to -# /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options (in this -# installation this directory is @localstatedir@) or -# ~/.my.cnf to set user-specific options. +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html # # In this file, you can use all long options that a program supports. # If you want to know which options a program supports, run the program @@ -52,9 +52,9 @@ server-id = 1 #binlog_format=mixed # Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = @localstatedir@/ +#innodb_data_home_dir = @localstatedir@ #innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = @localstatedir@/ +#innodb_log_group_home_dir = @localstatedir@ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high #innodb_buffer_pool_size = 16M === modified file 'win/configure.js' --- a/win/configure.js 2010-02-03 13:52:11 +0000 +++ b/win/configure.js 2010-11-18 16:02:37 +0000 @@ -101,8 +101,7 @@ try GetValue(configureIn, "DOT_FRM_VERSION") + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT_DEFAULT \"" + default_port + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + actual_port + "\")"); - configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" + - GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\")"); + configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"MySQL\")"); var version = GetVersion(configureIn); configfile.WriteLine("SET (VERSION \"" + version + "\")"); configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" + --===============4808488603214468070== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/georgi.kodinov@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: georgi.kodinov@stripped\ # 3xq1mklrwi0l1pz0 # target_branch: file:///home/kgeorge/mysql/work/B50021-5.1-bugteam/ # testament_sha1: 112893b4a3dd125e7c36d7cd00aae1a22b0b4379 # timestamp: 2010-11-18 18:03:11 +0200 # base_revision_id: vasil.dimov@stripped\ # j154vnn28ef2y9x5 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTlyp0kABjLfgEAQWGf//3+v vuS////wYAvvffMLMgKAABnW5UCpAqFAUVs0AaRGU0GBA0AAADQAANDEaHGTJkxGJgBMmCZADRhG AIYDjJkyYjEwAmTBMgBowjAEMAkUI0p6htQNAAB6gyGhoANAABFIgET0yKn4RppPCaCDCjUbQaAI xoJJBNNARiaMhMUwajTVMaQGaI9QAHpipxPbcQTVPqKRhVBGaOFS8Lb/r/uFcQMgzLkNTs6mUZLC VJyT80sS4SnOEuM45HKNc6dyPKskuiADNyHwZVSTMEiWVBMlJ1FEdrt7h2P+Pt/K3Hel9kr0mZjY k2xjGvn3QsuxZ49SddkEQzIUNRY6bqgRbVQxXanOTlODmUxc6LrxxMlRCbUaYYxXCl/ecB8ANwGT TLvSDs0TT8ZCZus/fgnVyqSqf8pCfz/kqqk7JjhMf6ScVZdFmZImM0q4UUpNISlLl9iUJFKeCUpY maK1ipPmkwLPRNCS112zKhcMpCZZUXynlTMnilQ2lVMknLlv3fZ28KbMNuSfDwva6JXKjdGrgFj0 ZZL2MGC/akVX4S5oKLEltoFBgaOPfrxYxRdkBl8SA46gl7CD5nbgdl4MUo7Hii2jWlwQsfxTSE0x F8B5WJ2hTz2IhX1vRf8Nt5Tkz+PToOZIv9PwkTCZnGQpJIhzJ1zbVDyS9Gl8kqX4pclqXbMi+iTS 3EDW/Q1SDZ0CDDMMgWbopZs4g5KRKIEaB45gZkSOTsNAcUgMhFAHUZCIvHT1O7ySeIHUPHARH0cy oLCimmsLGUEUqwiDSoHyKHvSYBoEkEFIwmPqHkyBEkWk6aS7oaiCG0SGU0zp0w6xeERdoj7GElxi nAMDEdC2ivbIJ0oQzJ2AmSYrEhyHUzYtIKpiJttnLbZRsdGzDIt4EChv4hIcTxgXwDNWoIUjfLGh SwLj/idurQigWmyQp9v2c66BqMCoDGmnSRShkNRYYjqqNs1dpUH/RBuEGmLRbhMr3zwBPZJG8ly5 FRsKlHJOrxhYD/MJlwSJRpKRBxmUETezrDnWEHhmOW8rRidVORcWGuxERGpMiVECJvHTITHh/4vN /W07D1Xm1JaOtIXJ5DByoDsbJG9gIEAmZQEZm/WoMy2pZGiL4Gzaju8QcTQnUMcCO4yNHDi9Yn0g PRA4opNT4mw8BBsJllV1sCEXXQMWCgA4xizD9B5b0BxGlqCSsMiqsqRTJqYp1xLUxGxLwmRA3q3m bC8qHFBu8zMO1SIHI8O+It241eW4KqLr6HQamWHXT91S5FJVYbuRcth6omSU6FQTVx5GGpYQI2lO 64eBaUm0qUHnganQ+hMb4F52lUGCOnnyJHXfulmP4PH7iKQMQGyXiSqyPHzp4Z0mWPhq4laNXjAe uNCRUGNRxHI6mBDA2Y5HaBspJGq2HA2nxLuJFWKtmgIG3CLi3abzDpuPppYY11GlpWQKLywvKDS1 BOpF2B1KkQRwttsImLxIgNUaXxTjB9Koua/Ac+O1iv8bVZUUokghAN5xIs+g8KjgQGJlBvpHkDZO ZWNaPKCRRE8PCwD2gO3ldIDNibK1QWGRcbSZw3lkDIeVc1FF3yROVoaXQ+sCVzoAxslcOnIe8CLk DPaAFAiibisObzAMC9YFbTG21fS14oYk9PlS2t4C2sBiRqhvn9K4itjFswgnijkFHlin9EhXZ+fx K36IllDcz2jEF4n1yJhAQ3fBRzROSGYIlCHkvRzgtTzsadaNARiRMMCbt4EqEBSiXb3UCVtiOfCn QgY0vxPc/afI/APwNpfaL6EPfEhehiwwp2pI1y4W7oiPkRV6H3Q7EPXADJm/C1Kk9SWcp6jN8ZUa EDe7SC9zFY2oULMbsqu00GDB91uyNpIkUkj7SDqPbj0LDAqHlQieVBUjr0icBnfkXImR4T9R6P57 LD88Sk/I8xX5pUZcA3HHUbT57CR3Guq648DSRM6ENUMkri074HxORy9C8vO6GbT1JvtcAnQOaSZh AX8v1d2iOR6Hpp5FppB6vEwzD38hPMDgdJ6HLkRMg8Sk0NORG3YgrLi5A+yhJOz+5HE4aOBefU6/ XpYb5bzmXMixkS/RHALg1NQOqrQjDNgIDOAqZTRYtc+hzKs2PlcjqA5Lo56KkOkxm1CGg7xEySIp kt156+RqHNXk4/0MIOJciJecNFcntLjmkzhmTmuxdE7V74lLCkSlbhNdMPHtw98PfB83w7jFSCxS OaI9+HBqOqyKiB0bd4NH/Ljef+MDkncPEvTo12ELpaJIfua1DUVg7tJ0UZd043QkfKQl521FKZLy 1KoMqXid5lVirtE3KuKS8zyPIYxJaqKKiwl7r2oNbCgVBAOp0MPT08O8QO5Y45Aepmj7JaI5d0nC WaKkfeTPG4VUhSExe9Fx98DAjMrrPnM0IhJHRHQ6yTGfEYROz1NAGSc+vailCK78hyPdEvoXTDuT N/EbycjJCbqmcAfq7Sg3HESyxyJkEbEMjmjyMkD0RY+9FiJ4HRIJ5sCKxBSczzPLPf3Q09LUYqxZ d7ANoegc09mpkCnVWVupdHiJH0P+7KUh708YbW/uA3IsQj7V+3a2tCMBDAFxrMSOKPgJdiU+VT7j +8i1aG5Nh1eYSO82PEOJ2ntSk8g3vSaCjtEkIXl5lUKaEwdCc2E7g8xDSJTMKNO8pPQCxG5UhfdC DYYhv8OX6gc1dKQmRPU9/tELkLQ0SzZzzO3cKwlbJKCwlUZKgCJYTSoQM/cOZHDlmej/meQg+KKi halUwKZkx28k9UvE3p6p8smWEhLUhSUKRrGWRLnSmcoA1nWu7uz5QuSMokSk2JEdSsJICggxpPVM rQLeLCJ42ZD1O9JgFqhVAkBUvQvZcZDh704gOnMLn/w1KF1h16xLU6KUxSC0QPahBViAQkKwm+ac 6AC1LiwrE3JFafBNI94peJrRJiwdw4FAdBPBKP0ToS9NL3MCEHUV9LoSr4FXUiXpxTT6MkyCyRIR gLZ4D5CaCPiYivrFQiuYBRlUbzEpTwEKBDx3az3nM1KdhgdZPf2nSYqZhO6Up+iT6Soh80sN/YX1 gSuFPpAku5OGOOBtIm2yQOvz7AJuRE2Gf3YfGkX2Y8UwK5Z06StbtblMQQQ94YUUaVuAbxRkiEGm h0vJ6GHociErZdhc0FG7A00NKQkk0muST8eVxankjWHBhoJVlbWYIilcAtdF6reN9EuVLKbbbbbb cEjvhQhqOSC8RcvYVaHw2SFvRoiDq4MOXI+RElBKIk4UrjNI7kbqpILzJzhKt54ogKCFyEttGBVQ nBIgSFYwSyULVeJyxbExMK6KWkqXINlJhWj0NSw5KY/ahu1o70N31rVcDzPHMgbViK1DC4GgUkEc NxWZ0Ec0WDy0gkjfonEl8PIOJu6YlojbwPuVZ8zXBcTM0JHrtUjgTNyOYg7OtqIIcodT582/JZG7 UPDM1RqcSYguwVQBcbkaESpHvAHsziLG5foL11JAZo7OQmLjExH2iD2ltNnLIzA0zKvU3+PE1HH/ xdyRThQkDlyp0kA= --===============4808488603214468070==--