Commit 2ba119c6 authored by unknown's avatar unknown
Browse files

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
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -3074,6 +3074,7 @@ mysql_execute_command(THD *thd)

    bzero((char*) &create_info, sizeof(create_info));
    create_info.db_type= DB_TYPE_DEFAULT;
    create_info.row_type= ROW_TYPE_NOT_USED;
    create_info.default_table_charset= thd->variables.collation_database;

    res= mysql_alter_table(thd, first_table->db, first_table->table_name,