diff options
Diffstat (limited to 'databases/mysql-gui/files')
20 files changed, 0 insertions, 320 deletions
diff --git a/databases/mysql-gui/files/patch-Animated_Icon.cc b/databases/mysql-gui/files/patch-Animated_Icon.cc deleted file mode 100644 index 1f6d7174128d..000000000000 --- a/databases/mysql-gui/files/patch-Animated_Icon.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- Animated_Icon.cc.orig Wed Sep 3 19:04:06 2003 -+++ Animated_Icon.cc Wed Sep 3 19:04:14 2003 -@@ -1,7 +1,7 @@ - #include <FL/Fl.H> - #include <FL/Animated_Icon.h> - --Animated_Icon::Animated_Icon(int x, int y, int w, int h, const char *l = 0) : -+Animated_Icon::Animated_Icon(int x, int y, int w, int h, const char *l) : - Fl_Box(x, y, w, h, l) - { - first = current = 0; diff --git a/databases/mysql-gui/files/patch-FL-Fl_Editor.H b/databases/mysql-gui/files/patch-FL-Fl_Editor.H deleted file mode 100644 index b8d466e74b02..000000000000 --- a/databases/mysql-gui/files/patch-FL-Fl_Editor.H +++ /dev/null @@ -1,10 +0,0 @@ ---- FL/Fl_Editor.H.orig Mon Feb 3 01:53:09 2003 -+++ FL/Fl_Editor.H Mon Feb 3 02:04:37 2003 -@@ -210,6 +210,7 @@ - Fl_Color textcolor() const { return(Fl_Color)textcolor_; } - void textcolor(uchar n) { textcolor_ = n; } - void LoadFrom(FILE *file) { engine->LoadFrom(file); engine->Command(MOVE_BOF); SyncDisplay(); ShowCursor(CURSOR_UNHIDE); } -+ void LoadSQL (const char *query) { engine->LoadSQL(query); ShowCursor(CURSOR_UNHIDE); SyncDisplay(); } - void SaveTo(FILE *file) { engine->SaveTo(file); } - void LoadFrom(const char *buffer) { engine->LoadFrom(buffer); SyncDisplay(); ShowCursor(CURSOR_UNHIDE); } - void SaveTo(char *buffer) { engine->SaveTo(buffer); } diff --git a/databases/mysql-gui/files/patch-FL-Selection.H b/databases/mysql-gui/files/patch-FL-Selection.H deleted file mode 100644 index 7c9e2db4fe49..000000000000 --- a/databases/mysql-gui/files/patch-FL-Selection.H +++ /dev/null @@ -1,11 +0,0 @@ ---- FL/Selection.H.orig Wed Sep 3 19:03:20 2003 -+++ FL/Selection.H Wed Sep 3 19:03:27 2003 -@@ -17,7 +17,7 @@ - private: - class SelectionRange - { -- friend Selection; -+ friend class Selection; - private: - int mFrom; - int mTo; diff --git a/databases/mysql-gui/files/patch-FL-editengine.h b/databases/mysql-gui/files/patch-FL-editengine.h deleted file mode 100644 index 1fc0d512fd58..000000000000 --- a/databases/mysql-gui/files/patch-FL-editengine.h +++ /dev/null @@ -1,10 +0,0 @@ ---- FL/editengine.h.orig Sat Aug 18 18:19:59 2001 -+++ FL/editengine.h Sat Aug 18 17:12:48 2001 -@@ -113,6 +113,7 @@ - rclError SetTabs(short *tabs); - rclError ChangeWidth(short newwidth) { Width = newwidth; return Command(REFORMAT,(long)newwidth); }; - rclError LoadFrom(const char *buffer); -+ rclError LoadSQL(const char *query); - rclError SaveTo(char *buffer); - rclError LoadFrom(FILE *infile); - rclError SaveTo(FILE *outfile); diff --git a/databases/mysql-gui/files/patch-Fl_NSlider.cc b/databases/mysql-gui/files/patch-Fl_NSlider.cc deleted file mode 100644 index d1484ffa24ba..000000000000 --- a/databases/mysql-gui/files/patch-Fl_NSlider.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- Fl_NSlider.cc.orig Mon Feb 3 02:17:30 2003 -+++ Fl_NSlider.cc Mon Feb 3 02:16:37 2003 -@@ -9,6 +9,7 @@ - * provided "as is" without express or implied warranty. - */ - #include <FL/Fl_NSlider.H> -+#include <FL/Fl_Group.H> - - static uchar isHoz = 0; //for image draw setup - static uchar r1, g1, b1; //for color ramp diff --git a/databases/mysql-gui/files/patch-Makefile b/databases/mysql-gui/files/patch-Makefile deleted file mode 100644 index ca405a541f2d..000000000000 --- a/databases/mysql-gui/files/patch-Makefile +++ /dev/null @@ -1,76 +0,0 @@ ---- Makefile.orig Wed Apr 11 21:12:20 2001 -+++ Makefile Mon Feb 3 18:19:49 2003 -@@ -1,27 +1,53 @@ - # --------------------- M a c r o s ------------------------------- --CC = gcc --CXX = g++ --#CFLAGS = -O0 -g -pipe -fno-default-inline --CFLAGS = -O3 -g -pipe -fforce-mem -fforce-addr --#CFLAGS = -g -pipe --#CFLAGS = -c -O2 -fstrength-reduce -finline-functions --INCLUDE1 = -I. -I../mysql++-1.7/sqlplusint -I/usr/local/include/mysql --LIBS = -L. -L/usr/X11R6/lib -lrcl -lrcledit -lsqlplus /usr/local/lib/mysql/libmysqlclient.a -lm -lflvw -lfltk -lXext -ljpeg --#LIBS = -L. -L/usr/X11R6/lib -lrcl -lrcledit /home/Sinisa/guiclient/libsqlplus.a /usr/local/lib/mysql/libmysqlclient.a -lfltk /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/lib/libstdc++.a /usr/lib/libm.a /usr/lib/libc.a xx.o --OBJS = edfile.o about.o db_tree.o Fl_NSlider.o getvars.o qsort.o queries.o bebac.o main.o do_sql.o tables.o dodatni.o status.o process.o grant.o password.o get_table.o admin.o single.o zoom.o sin_jpeg.o jmemsrc.o options.o Fl_File_Dialog.o Fl_Dir.o Fl_Input_File.o Fl_Toggle_Tree.o Fl_Toggle_Node.o Fl_Toggle_Tree_Base.o Fl_Toggle_Node_Base.o Animated_Icon.o Fl_Help.o Fl_Envelope.o Fl_Envelope_Scroll.o Selection.o gif.o -+ -+PREFIX?= /usr/X11R6 -+LOCALBASE?= /usr/local -+X11BASE?= /usr/X11R6 -+BSD_INSTALL_PROGRAM?= install -C -c -s -o root -g wheel -m 555 -+PTHREAD_CFLAGS?= -D_THREAD_SAFE -+PTHREAD_LIBS?= -pthread -+CPPFLAGS+= ${PTHREAD_CFLAGS} \ -+ -DFLTK_1_0_COMPAT \ -+ -I. \ -+ -I${LOCALBASE}/include \ -+ -I${LOCALBASE}/include/mysql \ -+ -I${X11BASE}/include -+LDFLAGS= -L${LOCALBASE}/lib \ -+ -L${LOCALBASE}/lib/mysql \ -+ -L${X11BASE}/lib -+LIBS= -lsqlplus -lmysqlclient -lfleditor -lflvw -lfltk \ -+ -ljpeg -lGLU -lGL -lXext -lX11 -lintl -lm -lz ${PTHREAD_LIBS} \ -+ -lcipher -+ -+TARGET= mysqlgui -+OBJS = Fl_Dir.o Fl_Envelope.o Fl_Envelope_Scroll.o \ -+ Fl_File_Dialog.o Fl_Help.o Fl_Input_File.o \ -+ Fl_NSlider.o Fl_Toggle_Node.o Fl_Toggle_Node_Base.o \ -+ Fl_Toggle_Tree.o Fl_Toggle_Tree_Base.o \ -+ Animated_Icon.o Selection.o \ -+ about.o admin.o bebac.o db_tree.o do_sql.o \ -+ dodatni.o get_table.o getvars.o gif.o grant.o \ -+ jmemsrc.o main.o options.o password.o process.o \ -+ qsort.o queries.o sin_jpeg.o single.o status.o \ -+ tables.o zoom.o - - # -------------------- R u l e s --------------------------------- --default: all --all: mysqlgui -+ -+all: $(TARGET) -+ -+install: $(TARGET) -+ ${BSD_INSTALL_PROGRAM} $(TARGET) ${PREFIX}/bin -+ - clean : -- /bin/rm *.o mysqlgui -+ rm -f *.o - -+clobber: clean -+ rm -f $(TARGET) - --mysqlgui: $(OBJS) --# $(CC) $(OBJS) $(LIBS) -o mysqlgui "-Wl,-rpath,../mysql++-1.7/sqlplusint/.libs" -- $(CXX) -o mysqlgui $(OBJS) $(LIBS) /usr/lib/libz.a -+$(TARGET): $(OBJS) -+ $(CXX) $(LDFLAGS) -o mysqlgui $(OBJS) $(LIBS) - --%.o : %.cc -- $(CXX) $(CFLAGS) $(INCLUDE1) -c $< --%.o : %.c -- gcc $(CFLAGS) $(INCLUDE1) -c $< -+.c.o: -+ ${CC} ${CFLAGS} ${CPPFLAGS} -c $< -+.cc.o: -+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c $< diff --git a/databases/mysql-gui/files/patch-about.cc b/databases/mysql-gui/files/patch-about.cc deleted file mode 100644 index a74d95c52605..000000000000 --- a/databases/mysql-gui/files/patch-about.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- about.cc.orig Wed Sep 3 19:04:33 2003 -+++ about.cc Wed Sep 3 19:04:46 2003 -@@ -11,6 +11,7 @@ - #include <stdio.h> - #endif - #include <string> -+using namespace std; - extern string c_info,s_info; - static Fl_Double_Window *xxx=(Fl_Double_Window *)0; - Fl_Window *splash=(Fl_Window *)0; diff --git a/databases/mysql-gui/files/patch-bebac.h b/databases/mysql-gui/files/patch-bebac.h deleted file mode 100644 index 71e1c4776532..000000000000 --- a/databases/mysql-gui/files/patch-bebac.h +++ /dev/null @@ -1,10 +0,0 @@ ---- bebac.h.orig Wed Apr 11 21:12:19 2001 -+++ bebac.h Mon Feb 3 02:28:44 2003 -@@ -5,6 +5,7 @@ - #include <FL/Fl.H> - #include <FL/Fl_Double_Window.H> - #include "client.h" -+#undef Success - #include <mysql++> - extern Connection *con; - extern void do_exit(Fl_Double_Window*, void*); diff --git a/databases/mysql-gui/files/patch-client.h b/databases/mysql-gui/files/patch-client.h deleted file mode 100644 index dce7f74f128f..000000000000 --- a/databases/mysql-gui/files/patch-client.h +++ /dev/null @@ -1,10 +0,0 @@ ---- client.h.orig Wed Sep 3 19:05:06 2003 -+++ client.h Wed Sep 3 19:05:21 2003 -@@ -45,6 +45,7 @@ - typedef long ssize_t; - #endif - #include <vector> -+using namespace std; - - class store_query { - public: diff --git a/databases/mysql-gui/files/patch-db_tree.cc b/databases/mysql-gui/files/patch-db_tree.cc deleted file mode 100644 index 66944fd72954..000000000000 --- a/databases/mysql-gui/files/patch-db_tree.cc +++ /dev/null @@ -1,9 +0,0 @@ ---- db_tree.cc.orig Wed Apr 11 21:12:19 2001 -+++ db_tree.cc Mon Feb 3 02:32:09 2003 -@@ -28,6 +28,7 @@ - #endif - #include <iomanip> - #include <string> -+#undef Success - #include <sqlplus.hh> - #include "client.h" diff --git a/databases/mysql-gui/files/patch-do_sql.cc b/databases/mysql-gui/files/patch-do_sql.cc deleted file mode 100644 index fad5479f5ff2..000000000000 --- a/databases/mysql-gui/files/patch-do_sql.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- do_sql.cc.orig Wed Apr 11 12:12:19 2001 -+++ do_sql.cc Thu Sep 4 02:17:56 2003 -@@ -1,3 +1,5 @@ -+#include <FL/Enumerations.H> -+#undef frame - #include <FL/Flv_Table.H> - #include <FL/Flve_Input.H> - #include <FL/Fl_Window.H> -@@ -5,10 +7,15 @@ - #include <FL/Fl_Pixmap.H> - #include <FL/Fl_Check_Button.H> - #include <FL/Fl_Round_Button.H> -+#define filename_setext fl_filename_setext - #include "bebac.h" - #include <sqlplus.hh> - #include <ctype.h> --extern string real_sql; extern enum ios::open_mode how_to_open; extern char *pass; -+#include <iostream> -+using namespace std; -+extern string real_sql; -+extern enum ios::open_mode how_to_open; -+extern char *pass; - #define depth 18 - #define minmin 5 - #define fontsize 14 diff --git a/databases/mysql-gui/files/patch-dodatni.cc b/databases/mysql-gui/files/patch-dodatni.cc deleted file mode 100644 index a016648b4686..000000000000 --- a/databases/mysql-gui/files/patch-dodatni.cc +++ /dev/null @@ -1,9 +0,0 @@ ---- dodatni.cc.orig Sat Aug 18 18:18:15 2001 -+++ dodatni.cc Sat Aug 18 09:51:00 2001 -@@ -1,5 +1,6 @@ - // generated by Fast Light User Interface Designer (fluid) version 1.00 - #include "bebac.h" -+#include <stdarg.h> - #ifdef __WIN32__ - extern "C" { - #define errno WSAGetLastError() diff --git a/databases/mysql-gui/files/patch-get_table.cc b/databases/mysql-gui/files/patch-get_table.cc deleted file mode 100644 index 6cb1cce50edb..000000000000 --- a/databases/mysql-gui/files/patch-get_table.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- get_table.cc.orig Wed Apr 11 21:12:25 2001 -+++ get_table.cc Mon Feb 3 03:40:34 2003 -@@ -1,6 +1,7 @@ - // generated by Fast Light User Interface Designer (fluid) version 1.00 - #include <FL/Fl_Menu_.H> - #include "get_table.h" -+#undef Success - #include <sqlplus.hh> - #include "client.h" - #include <FL/Fl_Pixmap.H> diff --git a/databases/mysql-gui/files/patch-gif.cc b/databases/mysql-gui/files/patch-gif.cc deleted file mode 100644 index 33276477b436..000000000000 --- a/databases/mysql-gui/files/patch-gif.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- gif.cc.orig Wed Apr 11 21:12:24 2001 -+++ gif.cc Mon Feb 3 03:46:27 2003 -@@ -107,11 +107,11 @@ - box(FL_NO_BOX); end(); show(); - } - ~gif_window () { -- if (p && p->data) { -- char** real_data = (char**)(p->data); -+ if (p && p->alloc_data) { -+ char** real_data = (char**)(p->alloc_data); - for (int i = 0; i < 3; i++) delete[] real_data[i]; - delete[] real_data; -- p->data = 0; delete p; p = 0; -+ p->alloc_data = 0; delete p; p = 0; - } - if (linelength) free((void*)linelength); - } diff --git a/databases/mysql-gui/files/patch-grant.cc b/databases/mysql-gui/files/patch-grant.cc deleted file mode 100644 index 6f9e3b8b4110..000000000000 --- a/databases/mysql-gui/files/patch-grant.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- grant.cc.orig Wed Apr 11 21:12:24 2001 -+++ grant.cc Mon Feb 3 03:47:34 2003 -@@ -23,6 +23,7 @@ - #endif - #include <iomanip> - #include <string> -+#undef Success - #include <sqlplus.hh> - - #define REFRESH_GRANT 1 /* Refresh grant tables */ diff --git a/databases/mysql-gui/files/patch-main.cc b/databases/mysql-gui/files/patch-main.cc deleted file mode 100644 index 56c7e93ebbe6..000000000000 --- a/databases/mysql-gui/files/patch-main.cc +++ /dev/null @@ -1,34 +0,0 @@ ---- main.cc.orig Wed Apr 11 21:12:20 2001 -+++ main.cc Sun Dec 14 18:17:33 2003 -@@ -1,3 +1,4 @@ -+#define filename_setext fl_filename_setext - #include "bebac.h" - #include "qsort.h" - #include "komande.h" -@@ -18,7 +19,7 @@ - extern "C" { - char *intern_filename(char *,const char *); extern char *home_dir; - char *fn_format(char *to,const char *name,const char *dsk,const char *form,int flag); -- void load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); -+ int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); - void free_defaults(char **argv); - void mysql_read_default_options(struct st_mysql_options *options, const char *filename,const char *group); - int strcasecmp(const char *,const char *); -@@ -461,7 +462,7 @@ - } - - static void if_conn (void) { -- unsigned int j = 0, counter = 0; c_info=con->clinet_info(); s_info=con->server_info(); -+ unsigned int j = 0, counter = 0; c_info=con->client_info(); s_info=con->server_info(); - try { - Query query = con->query(); if (ldb) {ddd=(string)ldb; ldb=(char*)ddd.c_str();} - query << "show databases"; -@@ -526,7 +527,7 @@ - tables.insert(tables.end(),xx); - } - qSortHelp (0, (size_t) tables.size(), Fcmp, Exchange); -- ldb = (char *)databases[j].c_str(); c_info=con->clinet_info(); s_info=con->server_info(); -+ ldb = (char *)databases[j].c_str(); c_info=con->client_info(); s_info=con->server_info(); - b_connect->set(); down_group->activate(); query_browser->activate(); - if (databases.size()) choice_db->activate(); choice_db->redraw(); - ; if (query_menus) hier->activate(); diff --git a/databases/mysql-gui/files/patch-password.cc b/databases/mysql-gui/files/patch-password.cc deleted file mode 100644 index 1fb6843e60b6..000000000000 --- a/databases/mysql-gui/files/patch-password.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- password.cc.orig Wed Apr 11 21:12:25 2001 -+++ password.cc Mon Feb 3 03:58:35 2003 -@@ -1,6 +1,7 @@ - // generated by Fast Light User Interface Designer (fluid) version 1.00 - #include <FL/Fl_Menu_.H> - #include "password.h" -+#undef Success - #include <sqlplus.hh> - #include "client.h" - #include <FL/Fl_Pixmap.H> diff --git a/databases/mysql-gui/files/patch-process.cc b/databases/mysql-gui/files/patch-process.cc deleted file mode 100644 index d377aba4e0f2..000000000000 --- a/databases/mysql-gui/files/patch-process.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- process.cc.orig Wed Apr 11 21:12:24 2001 -+++ process.cc Mon Feb 3 04:00:41 2003 -@@ -1,6 +1,7 @@ - // generated by Fast Light User Interface Designer (fluid) version 1.00 - - #include "process.h" -+#undef Success - #include <sqlplus.hh> - extern char *pass; extern int w7_x, w7_y, server_version; extern Connection *con; - #include <FL/Fl_Pixmap.H> diff --git a/databases/mysql-gui/files/patch-single.cc b/databases/mysql-gui/files/patch-single.cc deleted file mode 100644 index b6e72c9b5f0b..000000000000 --- a/databases/mysql-gui/files/patch-single.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- single.cc.orig Wed Apr 11 21:12:23 2001 -+++ single.cc Mon Feb 3 04:05:55 2003 -@@ -1,16 +1,14 @@ - // generated by Fast Light User Interface Designer (fluid) version 1.00 -- - #include <client.h> -+#undef Success - #include <sqlplus.hh> -+#undef Time - // - // This file implements the file I/O routines for the editor engine. - // These are simple ASCII I/O routines, just for getting text out of - // a file, or putting it into one. - // - #include "single.h" --#include <FL/vartypes.h> --#include <FL/strings.h> --#include <FL/editor.h> - - extern Connection *con; diff --git a/databases/mysql-gui/files/patch-status.cc b/databases/mysql-gui/files/patch-status.cc deleted file mode 100644 index ee7f27bcc9c8..000000000000 --- a/databases/mysql-gui/files/patch-status.cc +++ /dev/null @@ -1,8 +0,0 @@ ---- status.cc.orig Wed Apr 11 21:12:24 2001 -+++ status.cc Mon Feb 3 04:10:54 2003 -@@ -1,4 +1,5 @@ - #include "status.h" -+#undef Success - #include <sqlplus.hh> - extern char *pass; extern int w8_x, w8_y; - #include <FL/Fl_Pixmap.H> |