diff options
| author | unknown <monty@donna.mysql.fi> | 2001-02-21 14:16:00 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-02-21 14:16:00 +0200 |
| commit | 6839b1728d8f6abc12cf4e75363a5b4591ad392d (patch) | |
| tree | 34f7d174c7e612bd03a5cf88fe4e2ac2411a33a4 /mysys | |
| parent | 0897a73a267b86615395c2d770f95428be5057cf (diff) | |
| download | mariadb-git-6839b1728d8f6abc12cf4e75363a5b4591ad392d.tar.gz | |
Fixes for innobase
Added test for ALTER TABLE ORDER BY
BUILD/FINISH.sh:
Fixes for innobase
BUILD/compile-pentium-debug:
Fixes for innobase
Docs/manual.texi:
Fixes for innobase
include/my_pthread.h:
Fixes for innobase
innobase/Makefile.am:
Fixes for innobase
innobase/btr/Makefile.am:
Fixes for innobase
innobase/data/Makefile.am:
Fixes for innobase
innobase/eval/Makefile.am:
Fixes for innobase
innobase/include/Makefile.i:
Fixes for innobase
innobase/os/Makefile.am:
Fixes for innobase
mysql-test/t/alter_table.test:
Added test for ALTER TABLE ORDER BY
mysys/my_error.c:
Skip 'l' in '%lu'
mysys/my_vsnprintf.c:
cleanup
sql/ha_innobase.cc:
Fixed type + remove warnings
sql/ha_innobase.h:
Remove warnings
sql/handler.cc:
cleanup
sql/sql_class.cc:
remove warnings
sql/sql_parse.cc:
remove warnings
sql/sql_table.cc:
Fixed bug in ALTER TABLE ... ORDER BY
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_error.c | 2 | ||||
| -rw-r--r-- | mysys/my_vsnprintf.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_error.c b/mysys/my_error.c index 562b192b24d..6887126e6ec 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.c @@ -65,6 +65,8 @@ int my_error(int nr,myf MyFlags, ...) /* Skipp if max size is used (to be compatible with printf) */ while (isdigit(*tpos) || *tpos == '.' || *tpos == '-') tpos++; + if (*tpos == 'l') /* Skipp 'l' argument */ + *tpos++; if (*tpos == 's') /* String parameter */ { par = va_arg(ap, char *); diff --git a/mysys/my_vsnprintf.c b/mysys/my_vsnprintf.c index 669b8be61b1..ab8edec4d7b 100644 --- a/mysys/my_vsnprintf.c +++ b/mysys/my_vsnprintf.c @@ -44,13 +44,13 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) fmt++; while (isdigit(*fmt) || *fmt == '.' || *fmt == '-') fmt++; - if(*fmt == 'l') + if (*fmt == 'l') fmt++; if (*fmt == 's') /* String parameter */ { reg2 char *par = va_arg(ap, char *); uint plen; - if(!par) par = (char*)"(null)"; + if (!par) par = (char*)"(null)"; plen = (uint) strlen(par); if ((uint) (end-to) > plen) /* Replace if possible */ { |