diff options
| author | monty@narttu.mysql.fi <> | 2003-11-03 14:01:59 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-11-03 14:01:59 +0200 |
| commit | a444a3449f87ad4c8060fe5769c0bae7a1b64eaf (patch) | |
| tree | f9406690fb9f579e21f4877826d439fb785d6902 /mysys | |
| parent | d9eca0e1271a5d8c9305ca1b7b9eada084cb61dc (diff) | |
| download | mariadb-git-a444a3449f87ad4c8060fe5769c0bae7a1b64eaf.tar.gz | |
Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 15eb358df22..b1d9e40a1c2 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (C) 2000-2003 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -214,6 +214,7 @@ int load_defaults(const char *conf_file, const char **groups, res= (char**) (ptr+sizeof(alloc)); /* copy name + found arguments + command line arguments to new array */ + res[0]= argv[0][0]; /* Name MUST be set, even by embedded library */ memcpy((gptr) (res+1), args.buffer, args.elements*sizeof(char*)); /* Skipp --defaults-file and --defaults-extra-file */ (*argc)-= args_used; |