diff options
author | unknown <monty@narttu.mysql.fi> | 2003-04-22 22:41:59 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-04-22 22:41:59 +0300 |
commit | ac02f54022f2a64ada230ef4a3f446b26b143275 (patch) | |
tree | 5d018897c694206dbaf1995bb7862e5d5ad8a93d /extra | |
parent | 43f1511a31a8e47682410ca5b02eb0dd4aba16d8 (diff) | |
download | mariadb-git-ac02f54022f2a64ada230ef4a3f446b26b143275.tar.gz |
Removed some not used files
Remove the 'fs' file systems as this is not maintained.
Moved programs from client to tests
tests/deadlock_test.c:
Rename: div/deadlock_test.c -> tests/deadlock_test.c
BitKeeper/deleted/.del-CorbaFS.idl~719ba9d93c206620:
Delete: fs/CorbaFS.idl
BitKeeper/deleted/.del-Makefile.am~95f21e278745904c:
Delete: fs/Makefile.am
BitKeeper/deleted/.del-RunServer.sh~34ea2653535fbb5c:
Delete: fs/RunServer.sh
BitKeeper/deleted/.del-database.c~af098622e818ce0d:
Delete: fs/database.c
BitKeeper/deleted/.del-dump.sql~68646092f0c5bc96:
Delete: fs/dump.sql
BitKeeper/deleted/.del-korbit-kernel-2.4.1-patch~742e5e67c1132b2e:
Delete: fs/korbit-kernel-2.4.1-patch
BitKeeper/deleted/.del-libmysqlfs.c~70cc07d61deedd16:
Delete: fs/libmysqlfs.c
BitKeeper/deleted/.del-libmysqlfs.h~7b60f308be50370e:
Delete: fs/libmysqlfs.h
BitKeeper/deleted/.del-my.cnf~bbd975fd6377e704:
Delete: fs/my.cnf
BitKeeper/deleted/.del-mysqlcorbafs.c~fc58c116eeea996a:
Delete: fs/mysqlcorbafs.c
BitKeeper/deleted/.del-mysqlcorbafs.h~414821d6836e655a:
Delete: fs/mysqlcorbafs.h
BitKeeper/deleted/.del-mysqlcorbafs_test.c~8bb3afa230542e05:
Delete: fs/mysqlcorbafs_test.c
BitKeeper/deleted/.del-README~b9f437fbd6dce7a5:
Delete: fs/README
BitKeeper/deleted/.del-mysqlfsck~247a2d2b9729b95e:
Delete: fs/mysqlfsck
tests/insert_test.c:
Rename: client/insert_test.c -> tests/insert_test.c
tests/list_test.c:
Rename: client/list_test.c -> tests/list_test.c
tests/select_test.c:
Rename: client/select_test.c -> tests/select_test.c
BitKeeper/deleted/.del-thimble.cc~3fa3754a4c639242:
Delete: client/thimble.cc
tests/thread_test.c:
Rename: client/thread_test.c -> tests/thread_test.c
tests/connect_test.c:
Rename: client/connect_test.c -> tests/connect_test.c
tests/showdb_test.c:
Rename: client/showdb_test.c -> tests/showdb_test.c
tests/ssl_test.c:
Rename: client/ssl_test.c -> tests/ssl_test.c
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
Delete: extra/mysql_install.c
BitKeeper/deleted/.del-cache_manager.cc~c506b365b140d30c:
Delete: sql/cache_manager.cc
BitKeeper/deleted/.del-cache_manager.h~adb8639e510c6f6e:
Delete: sql/cache_manager.h
client/Makefile.am:
Move insert_test, select_test and thread_test under 'tests'
extra/Makefile.am:
Remove not used program mysql_install
sql/item_strfunc.cc:
Simple optimization
sql/item_sum.cc:
Simple code cleanup.
tests/Makefile.am:
Added test programs
Diffstat (limited to 'extra')
-rw-r--r-- | extra/Makefile.am | 2 | ||||
-rw-r--r-- | extra/mysql_install.c | 258 |
2 files changed, 1 insertions, 259 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 8107beb2657..0276355ef65 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ - resolve_stack_dump mysql_install mysql_waitpid + resolve_stack_dump mysql_waitpid # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/extra/mysql_install.c b/extra/mysql_install.c deleted file mode 100644 index 11f33028ce1..00000000000 --- a/extra/mysql_install.c +++ /dev/null @@ -1,258 +0,0 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ - -/* Install or upgrade MySQL server. By Sasha Pachev <sasha@mysql.com> - */ - -#define INSTALL_VERSION "1.2" - -#define DONT_USE_RAID -#include <my_global.h> -#include <m_ctype.h> -#include <my_sys.h> -#include <m_string.h> -#include <mysql_version.h> -#include <errno.h> -#include <my_getopt.h> - -#define ANSWERS_CHUNCK 32 - -int have_gui=0; - -static struct my_option my_long_options[] = -{ - {"help", '?', "Display this help and exit.", - 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"version", 'V', "Output version information and exit.", - 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} -}; - -/* For now, not much exciting here, but we'll add more once - we add GUI support - */ -typedef struct -{ - FILE* out; - FILE* in; - const char* question; - int default_ind; - DYNAMIC_ARRAY answers; -} QUESTION_WIDGET; - -static void usage(); -static void die(const char* fmt, ...); -static void print_version(void); -static char get_answer_char(int ans_ind); -static int ask_user(const char* question,int default_ind, ...); -static void add_answer(QUESTION_WIDGET* w, const char* ans); -static void display_question(QUESTION_WIDGET* w); -static int init_question_widget(QUESTION_WIDGET* w, const char* question, - int default_ind); -static void end_question_widget(QUESTION_WIDGET* w); -static int get_answer(QUESTION_WIDGET* w); -static char answer_from_char(char c); -static void invalid_answer(QUESTION_WIDGET* w); - -enum {IMODE_STANDARD=0,IMODE_CUSTOM,IMODE_UPGRAGE} install_mode - = IMODE_STANDARD; - -static char get_answer_char(int ans_ind) -{ - return 'a' + ans_ind; -} - -static void invalid_answer(QUESTION_WIDGET* w) -{ - if (!have_gui) - { - fprintf(w->out, "ERROR: invalid answer, try again...\a\n"); - } -} - -static char answer_from_char(char c) -{ - return c - 'a'; -} - -static void die(const char* fmt, ...) -{ - va_list args; - va_start(args, fmt); - fprintf(stderr, "%s: ", my_progname); - vfprintf(stderr, fmt, args); - fprintf(stderr, "\n"); - va_end(args); - exit(1); -} - -static void display_question(QUESTION_WIDGET* w) -{ - if (!have_gui) - { - uint i,num_answers=w->answers.elements; - DYNAMIC_ARRAY* answers = &w->answers; - fprintf(w->out,"\n%s\n\n",w->question); - - for (i=0; i<num_answers; i++) - { - char* ans; - get_dynamic(answers,(gptr)&ans,i); - fprintf(w->out,"%c - %s\n",get_answer_char(i),ans); - } - fprintf(w->out,"q - Abort Install/Upgrade\n\n"); - } -} - -static void add_answer(QUESTION_WIDGET* w, const char* ans) -{ - insert_dynamic(&w->answers,(gptr)&ans); -} - -static int init_question_widget(QUESTION_WIDGET* w, const char* question, - int default_ind) -{ - if (have_gui) - { - w->in = w->out = 0; - } - else - { - w->out = stdout; - w->in = stdin; - } - w->question = question; - w->default_ind = default_ind; - if (my_init_dynamic_array(&w->answers,sizeof(char*), - ANSWERS_CHUNCK,ANSWERS_CHUNCK)) - die("Out of memory"); - return 0; -} - -static void end_question_widget(QUESTION_WIDGET* w) -{ - delete_dynamic(&w->answers); -} - -static int get_answer(QUESTION_WIDGET* w) -{ - if (!have_gui) - { - char buf[32]; - int ind; - char c; - if (!fgets(buf,sizeof(buf),w->in)) - die("Failed fgets on input stream"); - switch ((c=my_tolower(&my_charset_latin1,*buf))) - { - case '\n': - return w->default_ind; - case 'q': - die("Install/Upgrade aborted"); - default: - ind = answer_from_char(c); - if (ind >= 0 && ind < (int)w->answers.elements) - return ind; - } - } - return -1; -} - -static int ask_user(const char* question,int default_ind, ...) -{ - va_list args; - char* opt; - QUESTION_WIDGET w; - int ans; - - va_start(args,default_ind); - init_question_widget(&w,question,default_ind); - for (;(opt=va_arg(args,char*));) - { - add_answer(&w,opt); - } - for (;;) - { - display_question(&w); - if ((ans = get_answer(&w)) >= 0) - break; - invalid_answer(&w); - } - end_question_widget(&w); - va_end(args); - return ans; -} - - -static my_bool -get_one_option(int optid, const struct my_option *opt __attribute__((unused)), - char *argument __attribute__((unused))) -{ - switch(optid) { - case 'V': - print_version(); - exit(0); - case '?': - usage(); - exit(0); - } - return 0; -} - - -static int parse_args(int argc, char **argv) -{ - int ho_error; - - if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) - exit(ho_error); - - return 0; -} - -static void print_version(void) -{ - printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname,INSTALL_VERSION, - MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); -} - -static void usage() -{ - print_version(); - printf("MySQL AB, by Sasha Pachev\n"); - printf("This software comes with ABSOLUTELY NO WARRANTY\n\n"); - printf("Install or upgrade MySQL server.\n\n"); - printf("Usage: %s [OPTIONS] \n", my_progname); - my_print_help(my_long_options); - my_print_variables(my_long_options); -} - -int main(int argc, char** argv) -{ - MY_INIT(argv[0]); - parse_args(argc,argv); - install_mode = ask_user("Please select install/upgrade mode", - install_mode, "Standard Install", - "Custom Install", "Upgrade",0); - printf("mode=%d\n", install_mode); - return 0; -} - - - - - |