From 53d0daa3a0e5548e8226d228727ed056fb82fb99 Mon Sep 17 00:00:00 2001
From: "guilhem@mysql.com" <>
Date: Fri, 24 Sep 2004 11:54:37 +0200
Subject: Fix for BUG#3248 "Doc says MyISAM warns if disk full but it does
 not": we force the message to the error log, and we make it more informative;
 we treat EDQUOT like ENOSPC.

---
 sql/mysqld.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sql/mysqld.cc')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 06599cf0ea7..834cff0d869 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2080,8 +2080,7 @@ static void check_data_home(const char *path)
 
 
 /* ARGSUSED */
-extern "C" int my_message_sql(uint error, const char *str,
-			      myf MyFlags __attribute__((unused)))
+extern "C" int my_message_sql(uint error, const char *str, myf MyFlags)
 {
   NET *net;
   DBUG_ENTER("my_message_sql");
@@ -2094,7 +2093,7 @@ extern "C" int my_message_sql(uint error, const char *str,
       net->last_errno=error ? error : ER_UNKNOWN_ERROR;
     }
   }
-  else
+  if (!net || MyFlags & ME_NOREFRESH)
     sql_print_error("%s: %s",my_progname,str); /* purecov: inspected */
   DBUG_RETURN(0);
 }
-- 
cgit v1.2.1


From b7f35f00cb52494a8fa1b2201d3b4950e9e2db6f Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Thu, 30 Sep 2004 19:05:33 +0200
Subject: Solve compile problem for 4.0.22 on hpita2. (Backport of a 4.1
 change)

---
 sql/mysqld.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sql/mysqld.cc')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 834cff0d869..89d71ecbfa2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1114,14 +1114,14 @@ static void set_effective_user(struct passwd *user_info)
 {
 #if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
   DBUG_ASSERT(user_info);
-  if (setegid(user_info->pw_gid) == -1)
+  if (setregid((gid_t)-1,user_info->pw_gid) == -1)
   {
-    sql_perror("setegid");
+    sql_perror("setregid");
     unireg_abort(1);
   }  
-  if (seteuid(user_info->pw_uid) == -1)
+  if (setreuid((uid_t)-1,user_info->pw_uid) == -1)
   {
-    sql_perror("seteuid");
+    sql_perror("setreuid");
     unireg_abort(1);
   }
 #endif
@@ -2510,9 +2510,9 @@ You should consider changing lower_case_table_names to 1 or 2",
 #if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)
   if (locked_in_memory && !getuid())
   {
-    if (seteuid(0) == -1)
+    if (setreuid((uid_t)-1,0) == -1)
     {                        // this should never happen
-      sql_perror("seteuid");
+      sql_perror("setreuid");
       unireg_abort(1);
     }
     if (mlockall(MCL_CURRENT))
-- 
cgit v1.2.1