diff options
| author | monty@mysql.com <> | 2004-02-10 12:03:08 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-10 12:03:08 +0100 |
| commit | 079edf3313de5b1151979f8fad86e18d1563b9df (patch) | |
| tree | bdbe84927684ec56045577391850a226d3598a91 /sql | |
| parent | d9790a406c69a46eb197cea725c1e7c7e480ac41 (diff) | |
| download | mariadb-git-079edf3313de5b1151979f8fad86e18d1563b9df.tar.gz | |
Code cleanups
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.h | 5 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sql/handler.h b/sql/handler.h index 750db45759e..ead0ed106c7 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -319,8 +319,9 @@ public: virtual void append_create_info(String *packet) {} virtual char* get_foreign_key_create_info() { return(NULL);} /* gets foreign key create string from InnoDB */ - virtual uint referenced_by_foreign_key() { return 0;} /* used in REPLACE; - is > 0 if table is referred by a FOREIGN KEY */ + + /* used in REPLACE; is > 0 if table is referred by a FOREIGN KEY */ + virtual uint referenced_by_foreign_key() { return 0;} virtual void init_table_handle_for_HANDLER() { return; } /* prepare InnoDB for HANDLER */ virtual void free_foreign_key_create_info(char* str) {} diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 4d7a9f7e508..bf3112bdf10 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -438,7 +438,8 @@ int write_record(TABLE *table,COPY_INFO *info) key_copy((byte*) key,table,key_nr,0); if ((error=(table->file->index_read_idx(table->record[1],key_nr, (byte*) key, - table->key_info[key_nr].key_length, + table->key_info[key_nr]. + key_length, HA_READ_KEY_EXACT)))) goto err; } @@ -449,8 +450,8 @@ int write_record(TABLE *table,COPY_INFO *info) UPDATE. */ - if (last_uniq_key(table,key_nr) - && !table->file->referenced_by_foreign_key()) + if (last_uniq_key(table,key_nr) && + !table->file->referenced_by_foreign_key()) { if ((error=table->file->update_row(table->record[1],table->record[0]))) goto err; |