diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2011-04-29 16:24:56 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2011-04-29 16:24:56 +0000 |
| commit | 8042ee8a11c90c846bee45454179de1c0e0e4b2b (patch) | |
| tree | ec77b6e426a1a95d53062a0c806c286a0fcfe355 /databases/mariadb-scripts/files | |
| parent | - update to 1.9.2.17 (diff) | |
-Upgrade of mariadb to 5.2.5
-Fix pkg-plist
PR: ports/156681
Submitted by: Desvernay Geoffroy (dgeo@centrale-marseille.fr)(maintainer)
Approved by: itetcu (mentor)(implicit)
Notes
Notes:
svn path=/head/; revision=273338
Diffstat (limited to 'databases/mariadb-scripts/files')
| -rw-r--r-- | databases/mariadb-scripts/files/patch-extra::yassl::src::yassl_error.cpp | 13 | ||||
| -rw-r--r-- | databases/mariadb-scripts/files/patch-sql::mysqld.cc | 14 |
2 files changed, 27 insertions, 0 deletions
diff --git a/databases/mariadb-scripts/files/patch-extra::yassl::src::yassl_error.cpp b/databases/mariadb-scripts/files/patch-extra::yassl::src::yassl_error.cpp new file mode 100644 index 000000000000..22f981de5570 --- /dev/null +++ b/databases/mariadb-scripts/files/patch-extra::yassl::src::yassl_error.cpp @@ -0,0 +1,13 @@ +--- extra/yassl/src/yassl_error.cpp 2010-04-28 12:52:24 +0000 ++++ extra/yassl/src/yassl_error.cpp 2011-03-01 17:03:38 +0000 +@@ -128,7 +128,7 @@ + break; + + case badVersion_error : +- strncpy(buffer, "protocl version mismatch", max); ++ strncpy(buffer, "protocol version mismatch", max); + break; + + case compress_error : + + diff --git a/databases/mariadb-scripts/files/patch-sql::mysqld.cc b/databases/mariadb-scripts/files/patch-sql::mysqld.cc new file mode 100644 index 000000000000..b3eb0311e544 --- /dev/null +++ b/databases/mariadb-scripts/files/patch-sql::mysqld.cc @@ -0,0 +1,14 @@ +--- sql/mysqld.cc 2011-02-28 17:39:30 +0000 ++++ sql/mysqld.cc 2011-03-04 10:39:27 +0000 +@@ -744,9 +744,7 @@ + /* Static variables */ + + static bool kill_in_progress, segfaulted; +-#ifdef HAVE_STACKTRACE + static my_bool opt_stack_trace; +-#endif /* HAVE_STACKTRACE */ + static my_bool opt_bootstrap, opt_myisam_log; + static int cleanup_done; + static ulong opt_specialflag, opt_myisam_block_size; + + |