From 1ca422c26b67485c504f6778c4b4b88ad3c76f4d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 10 May 2010 16:23:08 +0200 Subject: [PATCH 1/4] bugfix from mysql-5.1, apparently lost in a merge --- sql/sql_select.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e3b34126828..4824019312e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10986,6 +10986,11 @@ create_internal_tmp_table_from_heap2(THD *thd, TABLE *table, if (table->s->db_type() != heap_hton || error != HA_ERR_RECORD_FILE_FULL) { + /* + We don't want this error to be converted to a warning, e.g. in case of + INSERT IGNORE ... SELECT. + */ + thd->fatal_error(); table->file->print_error(error,MYF(0)); DBUG_RETURN(1); } From 2a660c05c21c0c693e002098211bacb047c358f7 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Mon, 10 May 2010 21:23:16 +0300 Subject: [PATCH 2/4] Removed extra } that caused script to fail with syntax error --- scripts/mysqld_multi.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 528a1ca2e98..3d3853bcb22 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -71,7 +71,6 @@ sub main print "WARNING: --config-file is deprecated and will be removed\n"; print "in MySQL 5.6. Please use --defaults-extra-file instead\n"; } - } } foreach (@defaults_options) From fa18c9a80d9906ac307773679128a9413ff93eb3 Mon Sep 17 00:00:00 2001 From: Bo Thorsen Date: Wed, 12 May 2010 14:33:10 +0200 Subject: [PATCH 3/4] Build perl scripts in the correct directory --- scripts/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index f0db25be79a..2563c49280e 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -56,22 +56,22 @@ SET(pkgdatadir ${prefix}/share) SET(localstatedir ${prefix}/data) CONFIGURE_FILE(mysql_config.pl.in - scripts/mysql_config.pl ESCAPE_QUOTES @ONLY) + ${CMAKE_BINARY_DIR}/scripts/mysql_config.pl ESCAPE_QUOTES @ONLY) CONFIGURE_FILE(mysql_convert_table_format.sh - scripts/mysql_convert_table_format.pl ESCAPE_QUOTES @ONLY) + ${CMAKE_BINARY_DIR}/scripts/mysql_convert_table_format.pl ESCAPE_QUOTES @ONLY) CONFIGURE_FILE(mysql_install_db.pl.in - scripts/mysql_install_db.pl ESCAPE_QUOTES @ONLY) + ${CMAKE_BINARY_DIR}/scripts/mysql_install_db.pl ESCAPE_QUOTES @ONLY) CONFIGURE_FILE(mysql_secure_installation.pl.in - scripts/mysql_secure_installation.pl ESCAPE_QUOTES @ONLY) + ${CMAKE_BINARY_DIR}/scripts/mysql_secure_installation.pl ESCAPE_QUOTES @ONLY) CONFIGURE_FILE(mysqld_multi.sh - scripts/mysqld_multi.pl ESCAPE_QUOTES @ONLY) + ${CMAKE_BINARY_DIR}/scripts/mysqld_multi.pl ESCAPE_QUOTES @ONLY) CONFIGURE_FILE(mysqldumpslow.sh - scripts/mysqldumpslow.pl ESCAPE_QUOTES @ONLY) + ${CMAKE_BINARY_DIR}/scripts/mysqldumpslow.pl ESCAPE_QUOTES @ONLY) CONFIGURE_FILE(mysqlhotcopy.sh - scripts/mysqlhotcopy.pl ESCAPE_QUOTES @ONLY) + ${CMAKE_BINARY_DIR}/scripts/mysqlhotcopy.pl ESCAPE_QUOTES @ONLY) From febb68f5ae6357995879d34af300ba7b641fdf33 Mon Sep 17 00:00:00 2001 From: Bo Thorsen Date: Fri, 14 May 2010 14:12:23 +0200 Subject: [PATCH 4/4] Add a -nobuild argument to the script. Useful for building the zip file release with Express Edition which doesn't have the devenv command --- win/make_mariadb_win_dist | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win/make_mariadb_win_dist b/win/make_mariadb_win_dist index 9d0b3b26af3..67d23e55b8e 100644 --- a/win/make_mariadb_win_dist +++ b/win/make_mariadb_win_dist @@ -16,12 +16,14 @@ fi set -x -win/configure-mariadb.sh +if [ "x_$1" != "x_-nobuild" ]; then + win/configure-mariadb.sh -cmake -G "Visual Studio 9 2008" + cmake -G "Visual Studio 9 2008" -devenv.com MySQL.sln /build RelWithDebInfo -devenv.com MySQL.sln /build Debug + devenv.com MySQL.sln /build RelWithDebInfo + devenv.com MySQL.sln /build Debug +fi # TODO extract version number VER=`cat configure.in |