diff --git a/scripts/fill_help_tables.sh b/scripts/fill_help_tables.sh
index 1dff7edd268..e600d24032b 100644
--- a/scripts/fill_help_tables.sh
+++ b/scripts/fill_help_tables.sh
@@ -521,6 +521,7 @@ print <<EOF;
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 EOF
+print "set sql_mode='';\n";
 print "delete from help_topic;\n";
 print "delete from help_category;\n";
 print "delete from help_keyword;\n";
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index f9e776a8df4..dfe9a1bcbd2 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -873,6 +873,7 @@ fi
 
 cat << END_OF_DATA
 use mysql;
+set sql_mode='';
 set storage_engine=myisam;
 $c_d
 $i_d
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index 056761f3ad0..9cdea507493 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -8,6 +8,7 @@
 # this sql script.
 # On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
 
+set sql_mode='';
 set storage_engine=MyISAM;
 
 CREATE TABLE IF NOT EXISTS func (