diff options
| author | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
| commit | 447c18954e904e5770d64ae3b0817a16b9060b74 (patch) | |
| tree | 4689ffbe50e97ce9a47deb58fa2b9e7decdfc6a8 /merge | |
| parent | 102cabfe4acd9c78fe321829bd168342b3fbd68a (diff) | |
| parent | 759cf54a9e70013d92fe18a84b3e4c56244de7da (diff) | |
| download | mariadb-git-447c18954e904e5770d64ae3b0817a16b9060b74.tar.gz | |
merge with 3.23.42
Diffstat (limited to 'merge')
| -rw-r--r-- | merge/_locking.c | 4 | ||||
| -rw-r--r-- | merge/close.c | 3 | ||||
| -rw-r--r-- | merge/create.c | 3 | ||||
| -rw-r--r-- | merge/extra.c | 6 | ||||
| -rw-r--r-- | merge/open.c | 8 | ||||
| -rw-r--r-- | merge/panic.c | 4 | ||||
| -rw-r--r-- | merge/rsame.c | 8 | ||||
| -rw-r--r-- | merge/update.c | 6 |
8 files changed, 19 insertions, 23 deletions
diff --git a/merge/_locking.c b/merge/_locking.c index f90b41e2375..81582da1312 100644 --- a/merge/_locking.c +++ b/merge/_locking.c @@ -20,9 +20,7 @@ #include "mrgdef.h" -int mrg_lock_database(info,lock_type) -MRG_INFO *info; -int lock_type; +int mrg_lock_database(MRG_INFO *info,int lock_type) { int error,new_error; MRG_TABLE *file; diff --git a/merge/close.c b/merge/close.c index 45aa889ef0c..2b769ade8e9 100644 --- a/merge/close.c +++ b/merge/close.c @@ -18,8 +18,7 @@ #include "mrgdef.h" -int mrg_close(info) -register MRG_INFO *info; +int mrg_close(register MRG_INFO *info) { int error=0,new_error; MRG_TABLE *file; diff --git a/merge/create.c b/merge/create.c index e7086210237..fd2c16f9ea2 100644 --- a/merge/create.c +++ b/merge/create.c @@ -23,8 +23,7 @@ a NULL-pointer last */ -int mrg_create(name,table_names) -const char *name,**table_names; +int mrg_create(const char *name, const char**table_names) { int save_errno; uint errpos; diff --git a/merge/extra.c b/merge/extra.c index 343806dbfad..c4f048a4385 100644 --- a/merge/extra.c +++ b/merge/extra.c @@ -22,9 +22,9 @@ #include "mrgdef.h" -int mrg_extra(info,function) -MRG_INFO *info; -enum ha_extra_function function; +int mrg_extra( +MRG_INFO *info, +enum ha_extra_function function) { MRG_TABLE *file; diff --git a/merge/open.c b/merge/open.c index 05f194b42d4..7b5e571b9ad 100644 --- a/merge/open.c +++ b/merge/open.c @@ -30,10 +30,10 @@ */ -MRG_INFO *mrg_open(name,mode,handle_locking) -const char *name; -int mode; -int handle_locking; +MRG_INFO *mrg_open( +const char *name, +int mode, +int handle_locking) { int save_errno,i,errpos; uint files,dir_length,length, options; diff --git a/merge/panic.c b/merge/panic.c index c3820fe468d..cf333e3a9bf 100644 --- a/merge/panic.c +++ b/merge/panic.c @@ -24,8 +24,8 @@ done for all single user files to get changes in database */ -int mrg_panic(flag) -enum ha_panic_function flag; +int mrg_panic( +enum ha_panic_function flag) { int error=0; LIST *list_element,*next_open; diff --git a/merge/rsame.c b/merge/rsame.c index a18f1771c37..4ebf25b21c1 100644 --- a/merge/rsame.c +++ b/merge/rsame.c @@ -17,10 +17,10 @@ #include "mrgdef.h" -int mrg_rsame(info,record,inx) -MRG_INFO *info; -byte *record; -int inx; /* not used, should be 0 */ +int mrg_rsame( +MRG_INFO *info, +byte *record, +int inx) /* not used, should be 0 */ { if (inx) { diff --git a/merge/update.c b/merge/update.c index 64900b82116..9fcb82089e4 100644 --- a/merge/update.c +++ b/merge/update.c @@ -18,9 +18,9 @@ #include "mrgdef.h" -int mrg_update(info,oldrec,newrec) -register MRG_INFO *info; -const byte *oldrec,*newrec; +int mrg_update( +register MRG_INFO *info, +const byte *oldrec, const byte *newrec) { if (!info->current_table) { |