diff options
| author | unknown <istruewing@chilla.local> | 2006-12-20 18:22:26 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-20 18:22:26 +0100 |
| commit | ad858928bcb5b400a1b1e7e15d7938ce3b691f46 (patch) | |
| tree | 30b0df043747d46481555aa88eabb4c8546e3773 /myisam/mi_test1.c | |
| parent | 76da582ca5f8a93ae5ff7e7fdea1991d47658196 (diff) | |
| parent | fc9642b46dcd928a2116f04adf1bb24fb179f6cb (diff) | |
| download | mariadb-git-ad858928bcb5b400a1b1e7e15d7938ce3b691f46.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
myisam/mi_packrec.c:
Auto merged
myisam/mi_range.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/rt_split.c:
Auto merged
myisam/mi_write.c:
Manual merge from 4.1.
Diffstat (limited to 'myisam/mi_test1.c')
| -rw-r--r-- | myisam/mi_test1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c index 60225ccc7f3..26342ac3aaf 100644 --- a/myisam/mi_test1.c +++ b/myisam/mi_test1.c @@ -583,7 +583,7 @@ static struct my_option my_long_options[] = static my_bool get_one_option(int optid, const struct my_option *opt __attribute__((unused)), - char *argument) + char *argument __attribute__((unused))) { switch(optid) { case 'a': |