diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-28 09:18:23 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-28 09:18:23 +0300 |
| commit | d7a84c7af0e1eb166c48ce7a7c3e3dca83f43baf (patch) | |
| tree | cc96a38fba045126d5ddd2d125e830e1c2786a7e /myisammrg | |
| parent | 5e5d70399c249607352c1321c59e3f8eb38e43ab (diff) | |
| download | mariadb-git-d7a84c7af0e1eb166c48ce7a7c3e3dca83f43baf.tar.gz | |
Indentation cleanup & new comments
BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
Delete: mysys/getvar.c
zlib/zlib.dsp:
Turn on EOLN_NATIVE flag
libmysql/Makefile.shared:
Remove getvar.c
myisam/mi_cache.c:
Indentation cleanup
myisam/mi_check.c:
Indentation cleanup
Changed name of a variable
myisam/sort.c:
Indentation cleanup
Added initialization of a variable
myisammrg/myrg_delete.c:
Indentation cleanup
myisammrg/myrg_rsame.c:
Indentation cleanup
myisammrg/myrg_update.c:
Indentation cleanup
myisammrg/myrg_write.c:
Indentation cleanup
mysys/Makefile.am:
removed getvar.c
sql/field.cc:
Added warning counter to overflow() (and removed this from other places)
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_delete.c | 6 | ||||
| -rw-r--r-- | myisammrg/myrg_rsame.c | 4 | ||||
| -rw-r--r-- | myisammrg/myrg_update.c | 2 | ||||
| -rw-r--r-- | myisammrg/myrg_write.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/myisammrg/myrg_delete.c b/myisammrg/myrg_delete.c index 7aee0c20793..8b89ed62ac1 100644 --- a/myisammrg/myrg_delete.c +++ b/myisammrg/myrg_delete.c @@ -18,12 +18,10 @@ #include "myrg_def.h" -int myrg_delete( -MYRG_INFO *info, -const byte *record) +int myrg_delete(MYRG_INFO *info, const byte *record) { if (!info->current_table) - return my_errno=HA_ERR_NO_ACTIVE_RECORD ; + return (my_errno= HA_ERR_NO_ACTIVE_RECORD); return mi_delete(info->current_table->table,record); } diff --git a/myisammrg/myrg_rsame.c b/myisammrg/myrg_rsame.c index 2aa2fd78489..f6b2164dc21 100644 --- a/myisammrg/myrg_rsame.c +++ b/myisammrg/myrg_rsame.c @@ -19,10 +19,10 @@ int myrg_rsame(MYRG_INFO *info,byte *record,int inx) { if (inx) /* not yet used, should be 0 */ - return my_errno=HA_ERR_WRONG_INDEX; + return (my_errno=HA_ERR_WRONG_INDEX); if (!info->current_table) - return my_errno=HA_ERR_NO_ACTIVE_RECORD; + return (my_errno=HA_ERR_NO_ACTIVE_RECORD); return mi_rsame(info->current_table->table,record,inx); } diff --git a/myisammrg/myrg_update.c b/myisammrg/myrg_update.c index 0d4fc0bf215..7b9f614b965 100644 --- a/myisammrg/myrg_update.c +++ b/myisammrg/myrg_update.c @@ -21,7 +21,7 @@ int myrg_update(register MYRG_INFO *info,const byte *oldrec, byte *newrec) { if (!info->current_table) - return my_errno=HA_ERR_NO_ACTIVE_RECORD; + return (my_errno=HA_ERR_NO_ACTIVE_RECORD); return mi_update(info->current_table->table,oldrec,newrec); } diff --git a/myisammrg/myrg_write.c b/myisammrg/myrg_write.c index f911355aed5..0f191edc23c 100644 --- a/myisammrg/myrg_write.c +++ b/myisammrg/myrg_write.c @@ -26,5 +26,5 @@ int myrg_write(register MYRG_INFO *info, byte *rec) else if (info->merge_insert_method == MERGE_INSERT_TO_LAST) return mi_write(info->end_table[-1].table,rec); else /* unsupported insertion method */ - return my_errno=HA_ERR_WRONG_COMMAND; + return (my_errno= HA_ERR_WRONG_COMMAND); } |