diff options
author | Doug Barton <dougb@FreeBSD.org> | 2011-06-02 06:16:25 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2011-06-02 06:16:25 +0000 |
commit | 44708e91728187c3119e3d7a7812e4ad791beac8 (patch) | |
tree | 962fc7f0f243d967e5cab0c391990423a26a8559 /databases/mariadb-server/files/patch-sql::mysqld.cc | |
parent | - Update to 4.7.0 (diff) |
These aren't ready for use yet, just checking in my WIP
Notes
Notes:
svn path=/head/; revision=274964
Diffstat (limited to 'databases/mariadb-server/files/patch-sql::mysqld.cc')
-rw-r--r-- | databases/mariadb-server/files/patch-sql::mysqld.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/databases/mariadb-server/files/patch-sql::mysqld.cc b/databases/mariadb-server/files/patch-sql::mysqld.cc index b3eb0311e544..91fdb26d2169 100644 --- a/databases/mariadb-server/files/patch-sql::mysqld.cc +++ b/databases/mariadb-server/files/patch-sql::mysqld.cc @@ -1,8 +1,8 @@ ---- sql/mysqld.cc 2011-02-28 17:39:30 +0000 -+++ sql/mysqld.cc 2011-03-04 10:39:27 +0000 +--- sql/mysqld.cc.orig 2011-03-01 22:24:07.000000000 -0800 ++++ sql/mysqld.cc 2011-05-31 16:50:56.000000000 -0700 @@ -744,9 +744,7 @@ /* Static variables */ - + static bool kill_in_progress, segfaulted; -#ifdef HAVE_STACKTRACE static my_bool opt_stack_trace; @@ -10,5 +10,3 @@ static my_bool opt_bootstrap, opt_myisam_log; static int cleanup_done; static ulong opt_specialflag, opt_myisam_block_size; - - |