Commit 30d52f53 authored by unknown's avatar unknown

Code cleanups


client/mysqlbinlog.cc:
  Ensure that errors are returned to upper levels instead of just doing 'exit/die' in sub function.
sql/handler.h:
  Indentation cleanup
sql/sql_insert.cc:
  Indentation cleanup
parent e2646f09
This diff is collapsed.
...@@ -319,8 +319,9 @@ class handler :public Sql_alloc ...@@ -319,8 +319,9 @@ class handler :public Sql_alloc
virtual void append_create_info(String *packet) {} virtual void append_create_info(String *packet) {}
virtual char* get_foreign_key_create_info() virtual char* get_foreign_key_create_info()
{ return(NULL);} /* gets foreign key create string from InnoDB */ { 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() virtual void init_table_handle_for_HANDLER()
{ return; } /* prepare InnoDB for HANDLER */ { return; } /* prepare InnoDB for HANDLER */
virtual void free_foreign_key_create_info(char* str) {} virtual void free_foreign_key_create_info(char* str) {}
......
...@@ -438,7 +438,8 @@ int write_record(TABLE *table,COPY_INFO *info) ...@@ -438,7 +438,8 @@ int write_record(TABLE *table,COPY_INFO *info)
key_copy((byte*) key,table,key_nr,0); key_copy((byte*) key,table,key_nr,0);
if ((error=(table->file->index_read_idx(table->record[1],key_nr, if ((error=(table->file->index_read_idx(table->record[1],key_nr,
(byte*) key, (byte*) key,
table->key_info[key_nr].key_length, table->key_info[key_nr].
key_length,
HA_READ_KEY_EXACT)))) HA_READ_KEY_EXACT))))
goto err; goto err;
} }
...@@ -449,8 +450,8 @@ int write_record(TABLE *table,COPY_INFO *info) ...@@ -449,8 +450,8 @@ int write_record(TABLE *table,COPY_INFO *info)
UPDATE. UPDATE.
*/ */
if (last_uniq_key(table,key_nr) if (last_uniq_key(table,key_nr) &&
&& !table->file->referenced_by_foreign_key()) !table->file->referenced_by_foreign_key())
{ {
if ((error=table->file->update_row(table->record[1],table->record[0]))) if ((error=table->file->update_row(table->record[1],table->record[0])))
goto err; goto err;
......
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