From ed248762106fa0a80ec8e82da6b80c47a1d775fa Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Sun, 5 Feb 2006 10:08:40 +0000 Subject: Initial import of MySQL 5.1 version. This is an *alpha* release (5.1.5). --- databases/mysql60-server/files/patch-Makefile.in | 13 ++++++++----- .../files/patch-ndb::src::mgmclient::main.cpp | 11 ----------- .../mysql60-server/files/patch-scripts::Makefile.in | 17 ++++++++--------- 3 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp (limited to 'databases/mysql60-server/files') diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index 01dcfa676ad2..0263e8df0f63 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -1,15 +1,18 @@ ---- Makefile.in.orig Thu Dec 15 00:34:48 2005 -+++ Makefile.in Thu Dec 22 15:29:54 2005 -@@ -365,12 +365,7 @@ +--- Makefile.in.orig Tue Jan 10 12:21:14 2006 ++++ Makefile.in Sat Jan 28 15:55:32 2006 +@@ -360,15 +360,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_union_dirs@ scripts @man_dirs@ tests \ +- @sql_union_dirs@ @mysql_se_dirs@ \ +- @sql_server@ scripts @man_dirs@ tests \ +- @mysql_se_plugins@ \ - netware @libmysqld_dirs@ \ -- @bench_dirs@ support-files @tools_dirs@ +- @bench_dirs@ support-files @tools_dirs@ \ +- plugin +SUBDIRS = DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp b/databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp deleted file mode 100644 index ef1f6711f469..000000000000 --- a/databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ndb/src/mgmclient/main.cpp.orig Mon Jan 10 15:36:57 2005 -+++ ndb/src/mgmclient/main.cpp Mon Jan 10 15:37:26 2005 -@@ -122,7 +122,7 @@ - } - #ifdef HAVE_READLINE - /* Get a line from the user. */ -- line_read = readline (prompt); -+ line_read = readline ((char *)prompt); - /* If the line has any text in it, save it on the history. */ - if (line_read && *line_read) - add_history (line_read); diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in index 5e2d4e697ea6..dd0d6964ae12 100644 --- a/databases/mysql60-server/files/patch-scripts::Makefile.in +++ b/databases/mysql60-server/files/patch-scripts::Makefile.in @@ -1,8 +1,8 @@ ---- scripts/Makefile.in.orig Sat Jun 11 03:32:05 2005 -+++ scripts/Makefile.in Thu Jun 16 23:09:08 2005 -@@ -333,24 +333,7 @@ - uname_prog = @uname_prog@ - yassl_dir = @yassl_dir@ +--- scripts/Makefile.in.orig Tue Jan 10 12:21:25 2006 ++++ scripts/Makefile.in Sat Jan 28 15:59:15 2006 +@@ -336,23 +336,7 @@ + yassl_libs_with_path = @yassl_libs_with_path@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -bin_SCRIPTS = @server_scripts@ \ - msql2mysql \ @@ -19,14 +19,13 @@ - mysqlhotcopy \ - mysqldumpslow \ - mysql_explain_log \ -- mysql_tableinfo \ - mysqld_multi \ - mysql_create_system_tables +bin_SCRIPTS = - EXTRA_SCRIPTS = make_binary_distribution.sh \ - make_sharedlib_distribution.sh \ -@@ -380,7 +363,7 @@ + noinst_SCRIPTS = make_binary_distribution \ + make_sharedlib_distribution \ +@@ -384,7 +368,7 @@ mysqlaccess.conf \ mysqlbug -- cgit v1.2.3