Commit 45178e66 authored by istruewing@chilla.local's avatar istruewing@chilla.local

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines

into  chilla.local:/home/mydev/mysql-5.1-bug24607
parents 786063e3 a9183720
...@@ -521,6 +521,7 @@ print <<EOF; ...@@ -521,6 +521,7 @@ print <<EOF;
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
EOF EOF
print "set sql_mode='';\n";
print "delete from help_topic;\n"; print "delete from help_topic;\n";
print "delete from help_category;\n"; print "delete from help_category;\n";
print "delete from help_keyword;\n"; print "delete from help_keyword;\n";
......
...@@ -873,6 +873,7 @@ fi ...@@ -873,6 +873,7 @@ fi
cat << END_OF_DATA cat << END_OF_DATA
use mysql; use mysql;
set sql_mode='';
set storage_engine=myisam; set storage_engine=myisam;
$c_d $c_d
$i_d $i_d
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
# this sql script. # this sql script.
# On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql' # On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
set sql_mode='';
set storage_engine=MyISAM; set storage_engine=MyISAM;
CREATE TABLE IF NOT EXISTS func ( CREATE TABLE IF NOT EXISTS func (
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment