{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww9000\viewh8400\viewkind0
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural

\f0\fs24 \cf0 --- client_priv.h.orig	2009-11-26 11:23:07.000000000 +0100\
+++ client_priv.h	2009-11-26 11:23:35.000000000 +0100\
@@ -56,7 +56,7 @@\
 #endif\
   OPT_TRIGGERS,\
   OPT_MYSQL_ONLY_PRINT,\
-  OPT_MYSQL_LOCK_DIRECTORY,\
+  OPT_MYSQL_LOCK_DIRECTORY, OPT_HISTORY,\
   OPT_USE_THREADS,\
   OPT_IMPORT_USE_THREADS,\
   OPT_MYSQL_NUMBER_OF_QUERY,\
\
\
--- mysql.cc.orig	2009-11-26 11:24:35.000000000 +0100\
+++ mysql.cc	2009-11-26 11:44:25.000000000 +0100\
@@ -26,6 +26,9 @@\
  *   Tonu Samuel   <tonu@mysql.com>\
  *   Harrison Fisk <harrison@mysql.com>\
  *\
+ * Patched by: \
+ *   Nicklas Westerlund <westerlundn@mac.com>\
+ *\
  **/\
 \
 #include "client_priv.h"\
@@ -43,7 +46,7 @@\
 #include <locale.h>\
 #endif\
 \
-const char *VER= "14.14";\
+const char *VER= "14.15";\
 \
 /* Don't try to make a nice table if the data is too big */\
 #define MAX_COLUMN_LENGTH	     1024\
@@ -144,7 +147,7 @@\
 	       default_charset_used= 0, opt_secure_auth= 0,\
                default_pager_set= 0, opt_sigint_ignore= 0,\
                show_warnings= 0, executing_query= 0, interrupted_query= 0,\
-               ignore_spaces= 0;\
+               ignore_spaces= 0, opt_no_history= 0;\
 static my_bool debug_info_flag, debug_check_flag;\
 static my_bool column_types_flag;\
 static my_bool preserve_comments= 0;\
@@ -1096,7 +1099,7 @@\
     ignore_errors=0;\
   \}\
   else\
-    status.add_to_history=1;\
+  status.add_to_history=1;\
   status.exit_status=1;\
 \
   \{\
@@ -1185,6 +1188,11 @@\
         my_free(histfile, MYF(MY_ALLOW_ZERO_PTR));\
         histfile= 0;\
       \}\
+      if (opt_no_history)\
+      \{\
+        my_free(histfile, MYF(MY_ALLOW_ZERO_PTR));\
+        histfile= 0;\
+      \}\
     \}\
 \
     /* We used to suggest setting MYSQL_HISTFILE=/dev/null. */\
@@ -1485,6 +1493,7 @@\
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0\},\
   \{"no-tee", OPT_NOTEE, "Disable outfile. See interactive help (\\\\h) also. WARNING: option deprecated; use --disable-tee instead", 0, 0, 0, GET_NO_ARG,\
    NO_ARG, 0, 0, 0, 0, 0, 0\},\
+  \{"no-history", OPT_HISTORY, "Disable logging of history", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0\},\
 #ifndef DONT_ALLOW_USER_CHANGE\
   \{"user", 'u', "User for login if not current user.", (uchar**) &current_user,\
    (uchar**) &current_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0\},\
@@ -1631,6 +1640,9 @@\
     if (opt_outfile)\
       end_tee();\
     break;\
+  case OPT_HISTORY:\
+    opt_no_history= 1;\
+    break;\
   case OPT_PAGER:\
     if (argument == disabled_my_option)\
       opt_nopager= 1;\
}