database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

After merge fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-11-03 20:07:17 +02:00
parent 60691a637a
commit 0c1bcddbae
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysqld/lib_sql.cc
View File

@ -591,7 +591,7 @@ err:
C_MODE_END C_MODE_END
bool Protocol::send_fields(List<Item> *list, int flags) bool Protocol::send_fields(List<Item> *list, uint flags)
{ {
List_iterator_fast<Item> it(*list); List_iterator_fast<Item> it(*list);
Item *item; Item *item;

19
sql/handler.cc
View File

@ -157,12 +157,11 @@ enum db_type ha_checktype(enum db_type database_type)
break; break;
} }
return return ((enum db_type) thd->variables.table_type != DB_TYPE_UNKNOWN ?
DB_TYPE_UNKNOWN != (enum db_type) thd->variables.table_type ? (enum db_type) thd->variables.table_type :
(enum db_type) thd->variables.table_type : (enum db_type) global_system_variables.table_type !=
DB_TYPE_UNKNOWN != (enum db_type) global_system_variables.table_type ? DB_TYPE_UNKNOWN ?
(enum db_type) global_system_variables.table_type : (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM);
DB_TYPE_MYISAM;
} /* ha_checktype */ } /* ha_checktype */
@ -784,10 +783,14 @@ bool ha_flush_logs()
int ha_delete_table(enum db_type table_type, const char *path) int ha_delete_table(enum db_type table_type, const char *path)
{ {
handler *file;
char tmp_path[FN_REFLEN]; char tmp_path[FN_REFLEN];
handler *file=(table_type== DB_TYPE_UNKNOWN ? 0 : get_new_handler((TABLE*) 0, table_type));
if (!file) /* DB_TYPE_UNKNOWN is used in ALTER TABLE when renaming only .frm files */
if (table_type == DB_TYPE_UNKNOWN ||
! (file=get_new_handler((TABLE*) 0, table_type)))
return ENOENT; return ENOENT;
if (lower_case_table_names == 2 && !(file->table_flags() & HA_FILE_BASED)) if (lower_case_table_names == 2 && !(file->table_flags() & HA_FILE_BASED))
{ {
/* Ensure that table handler get path in lower case */ /* Ensure that table handler get path in lower case */

3
sql/sql_table.cc
View File

@ -3085,7 +3085,6 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
} }
/* We don't want update TIMESTAMP fields during ALTER TABLE. */ /* We don't want update TIMESTAMP fields during ALTER TABLE. */
new_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
thd->count_cuted_fields= CHECK_FIELD_WARN; // calc cuted fields thd->count_cuted_fields= CHECK_FIELD_WARN; // calc cuted fields
thd->cuted_fields=0L; thd->cuted_fields=0L;
thd->proc_info="copy to tmp table"; thd->proc_info="copy to tmp table";
@ -3093,7 +3092,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
copied=deleted=0; copied=deleted=0;
if (new_table && !new_table->is_view) if (new_table && !new_table->is_view)
{ {
new_table->timestamp_default_now= 0; new_table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
new_table->next_number_field=new_table->found_next_number_field; new_table->next_number_field=new_table->found_next_number_field;
error=copy_data_between_tables(table,new_table,create_list, error=copy_data_between_tables(table,new_table,create_list,
handle_duplicates, handle_duplicates,