bk commit into 5.1 tree (acurtis:1.2374) BUG#24270

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-02 09:42:13-08:00, acurtis@stripped +3 -0
  Bug#24270
    "mysql_install_db doesn't work properly on 5.1"
    force sql_mode to known value within initialization scripts

  scripts/fill_help_tables.sh@stripped, 2007-01-02 09:42:11-08:00, acurtis@stripped +1 -0
    force sql_mode to known value

  scripts/mysql_create_system_tables.sh@stripped, 2007-01-02 09:42:11-08:00, acurtis@stripped +1 -0
    force sql_mode to known value

  scripts/mysql_fix_privilege_tables.sql@stripped, 2007-01-02 09:42:11-08:00, acurtis@stripped +1 -0
    force sql_mode to known value

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/p2-bug24270.2

--- 1.53/scripts/mysql_fix_privilege_tables.sql	2007-01-02 09:42:32 -08:00
+++ 1.54/scripts/mysql_fix_privilege_tables.sql	2007-01-02 09:42:32 -08:00
@@ -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 (

--- 1.45/scripts/mysql_create_system_tables.sh	2007-01-02 09:42:32 -08:00
+++ 1.46/scripts/mysql_create_system_tables.sh	2007-01-02 09:42:32 -08:00
@@ -873,6 +873,7 @@
 
 cat << END_OF_DATA
 use mysql;
+set sql_mode='';
 set storage_engine=myisam;
 $c_d
 $i_d

--- 1.18/scripts/fill_help_tables.sh	2007-01-02 09:42:32 -08:00
+++ 1.19/scripts/fill_help_tables.sh	2007-01-02 09:42:32 -08:00
@@ -521,6 +521,7 @@
 -- 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";