Commit 2ba119c6 authored by unknown's avatar unknown

Merge bodhi.local:/opt/local/work/mysql-4.1-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/sql_parse.cc:
  Auto merged
parents 30393ec4 15c83425
...@@ -3074,6 +3074,7 @@ end_with_restore_list: ...@@ -3074,6 +3074,7 @@ end_with_restore_list:
bzero((char*) &create_info, sizeof(create_info)); bzero((char*) &create_info, sizeof(create_info));
create_info.db_type= DB_TYPE_DEFAULT; create_info.db_type= DB_TYPE_DEFAULT;
create_info.row_type= ROW_TYPE_NOT_USED;
create_info.default_table_charset= thd->variables.collation_database; create_info.default_table_charset= thd->variables.collation_database;
res= mysql_alter_table(thd, first_table->db, first_table->table_name, res= mysql_alter_table(thd, first_table->db, first_table->table_name,
......
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