diff options
| author | unknown <monty@tramp.mysql.fi> | 2000-10-06 21:15:03 +0300 |
|---|---|---|
| committer | unknown <monty@tramp.mysql.fi> | 2000-10-06 21:15:03 +0300 |
| commit | 6991b70c87163d3cb3477a19a947b07cbfec9660 (patch) | |
| tree | 8ebcaf3db2393c7d413acc624301ee8971a5666e /extra | |
| parent | 295c3d1fa9a1950d1ebf6832da896e36f483d692 (diff) | |
| download | mariadb-git-6991b70c87163d3cb3477a19a947b07cbfec9660.tar.gz | |
DISTINCT optimization
Fixes when using column privileges
Manual updates
Docs/manual.texi:
Comments from MySQL training + distinct optimization
extra/my_print_defaults.c:
Added --defaults-extra-file
include/my_sys.h:
Added --defaults-extra-file
mysys/default.c:
Added --defaults-extra-file
sql/sql_acl.cc:
Tables with only column privileges didn't show up in SHOW GRANTS or SHOW TABLES
sql/sql_select.cc:
DISTINCT optimization
sql/sql_select.h:
DISTINCT optimization
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/my_print_defaults.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 01fc4108352..ad15793617b 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -32,6 +32,8 @@ static struct option long_options[] = { {"config-file", required_argument, 0, 'c'}, {"defaults-file", required_argument, 0, 'c'}, + {"defaults-extra-file", required_argument, 0, 'e'}, + {"extra-file", required_argument, 0, 'e'}, {"no-defaults", no_argument, 0, 'd'}, {"help", no_argument, 0, '?'}, {"version", no_argument, 0, 'V'}, @@ -40,7 +42,7 @@ static struct option long_options[] = static void usage(my_bool version) { - printf("%s Ver 1.1 for %s at %s\n",my_progname,SYSTEM_TYPE, + printf("%s Ver 1.2 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); if (version) return; @@ -50,6 +52,9 @@ static void usage(my_bool version) printf("\n\ -c, --config-file=#, --defaults-file=#\n\ The config file to use (default '%s')\n\ + -e, --extra-file=#, --defaults-extra-file=#\n\ + Read this file after the global /etc config file and\n\ + before the config file in the users home directory.\n\ --no-defaults Return an empty string (useful for scripts)\n\ -?, --help Display this help message and exit.\n\ -V, --version Output version information and exit.\n", @@ -61,13 +66,16 @@ static int get_options(int *argc,char ***argv) { int c,option_index; - while ((c=getopt_long(*argc,*argv,"c:V?I", + while ((c=getopt_long(*argc,*argv,"c:e:V?I", long_options, &option_index)) != EOF) { switch (c) { case 'c': config_file=optarg; break; + case 'e': + defaults_extra_file=optarg; /* Used by the load_defaults */ + break; case 'n': exit(0); case 'I': @@ -102,7 +110,7 @@ int main(int argc, char **argv) if (get_options(&argc,&argv)) exit(1); if (!(load_default_groups=(char**) my_malloc((argc+2)*sizeof(char*), - MYF(MY_WME)))) + MYF(MY_WME)))) exit(1); for (count=0; *argv ; argv++,count++) |