Commit 180db5f2 authored by unknown's avatar unknown
Browse files

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

into  chilla.local:/home/mydev/mysql-5.1-bug24607
parents 12d8755b df7ba962

scripts/fill_help_tables.sh

+1 −0
Original line number Diff line number Diff line
@@ -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";

scripts/mysql_create_system_tables.sh

+1 −0
Original line number Diff line number Diff line
@@ -873,6 +873,7 @@ fi 


cat << END_OF_DATA

use mysql;

set sql_mode='';

set storage_engine=myisam;

$c_d

$i_d

scripts/mysql_fix_privilege_tables.sql

+1 −0
Original line number Diff line number Diff line
@@ -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 (