mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 11:31:51 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug24607
This commit is contained in:
commit
45178e6677
3 changed files with 3 additions and 0 deletions
|
@ -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
|
||||||
|
|
||||||
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 @@
|
||||||
# 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 (
|
||||||
|
|
Loading…
Add table
Reference in a new issue