1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00

Merge with 4.1

scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/set_var.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
sql/handler.cc:
  Merge
sql/handler.h:
  Merge
sql/mysqld.cc:
  Merge
This commit is contained in:
unknown
2005-04-16 04:35:54 +03:00
8 changed files with 80 additions and 21 deletions

View File

@@ -722,6 +722,7 @@ fi
cat << END_OF_DATA
use mysql;
set table_type=myisam;
$c_d
$i_d