errors without code removed

net_printf/send_error calls replaced by my_error family functions
-1/1 (sent/unsent) error reporting removed
(WL#2133)


include/mysqld_error.h:
  new errors added.
mysql-test/r/rpl_charset.result:
  new error
mysql-test/r/rpl_timezone.result:
  new error
mysql-test/r/sp-security.result:
  more clean error message
mysql-test/r/sp.result:
  now error state intercepted correctly
mysql-test/t/connect.test:
  new error message
mysql-test/t/rpl_charset.test:
  new error message
mysql-test/t/rpl_timezone.test:
  new error
mysql-test/t/sp-security.test:
  more correct error handling
mysql-test/t/sp.test:
  now error state intercepted correctly
sql/ha_innodb.cc:
  -1/1 (sent/unsent) error reporting removed
sql/ha_innodb.h:
  -1/1 (sent/unsent) error reporting removed
sql/item.cc:
  only boolean values should be returned by fix_fields()
sql/item_cmpfunc.cc:
  only boolean values should be returned by fix_fields()
sql/item_func.cc:
  only boolean values should be returned by fix_fields()
  net_printf/send_error calls replaced by my_error family functions
sql/item_row.cc:
  only boolean values should be returned by fix_fields()
sql/item_subselect.cc:
  only boolean values should be returned by fix_fields()
  -1/1 (sent/unsent) error reporting removed
sql/item_subselect.h:
  -1/1 (sent/unsent) error reporting removed
sql/item_sum.cc:
  only boolean values should be returned by fix_fields()
sql/item_timefunc.cc:
  only boolean values should be returned by fix_fields()
sql/item_uniq.h:
  only boolean values should be returned by fix_fields()
sql/mysql_priv.h:
  -1/1 (sent/unsent) error reporting removed
sql/mysqld.cc:
  net_printf/send_error calls replaced by my_error family functions
  changes in my_message_sql to support error handling correctly
sql/protocol.cc:
  net_printf/send_error calls replaced by my_error family functions
sql/protocol_cursor.cc:
  net_printf/send_error calls replaced by my_error family functions
sql/repl_failsafe.cc:
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed
sql/repl_failsafe.h:
  -1/1 (sent/unsent) error reporting removed
sql/set_var.cc:
  net_printf/send_error calls replaced by my_error family functions
sql/share/czech/errmsg.txt:
  new error messages
sql/share/danish/errmsg.txt:
  new error messages
sql/share/dutch/errmsg.txt:
  new error messages
sql/share/english/errmsg.txt:
  new error messages
sql/share/estonian/errmsg.txt:
  new error messages
sql/share/french/errmsg.txt:
  new error messages
sql/share/german/errmsg.txt:
  new error messages
sql/share/greek/errmsg.txt:
  new error messages
sql/share/hungarian/errmsg.txt:
  new error messages
sql/share/italian/errmsg.txt:
  new error messages
sql/share/japanese/errmsg.txt:
  new error messages
sql/share/korean/errmsg.txt:
  new error messages
sql/share/norwegian-ny/errmsg.txt:
  new error messages
sql/share/norwegian/errmsg.txt:
  new error messages
sql/share/polish/errmsg.txt:
  new error messages
sql/share/portuguese/errmsg.txt:
  new error messages
sql/share/romanian/errmsg.txt:
  new error messages
sql/share/russian/errmsg.txt:
  new error messages
sql/share/serbian/errmsg.txt:
  new error messages
sql/share/slovak/errmsg.txt:
  new error messages
sql/share/spanish/errmsg.txt:
  new error messages
sql/share/swedish/errmsg.txt:
  new error messages
sql/share/ukrainian/errmsg.txt:
  new error messages
sql/slave.cc:
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed
sql/slave.h:
  -1/1 (sent/unsent) error reporting removed
sql/sp.cc:
  net_printf/send_error calls replaced by my_error family functions
sql/sp_head.cc:
  new eror handling support
  net_printf/send_error calls replaced by my_error family functions
sql/sp_rcontext.cc:
  net_printf/send_error calls replaced by my_error family functions
sql/sql_acl.cc:
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed
sql/sql_acl.h:
  -1/1 (sent/unsent) error reporting removed
sql/sql_base.cc:
  -1/1 (sent/unsent) error reporting removed
  net_printf/send_error calls replaced by my_error family functions
sql/sql_class.cc:
  net_printf/send_error calls replaced by my_error family functions
sql/sql_class.h:
  my_messhage_sql now set/reset query_error flag
sql/sql_db.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_delete.cc:
  -1/1 (sent/unsent) error reporting removed
  net_printf/send_error calls replaced by my_error family functions
sql/sql_do.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_error.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_handler.cc:
  -1/1 (sent/unsent) error reporting removed
  net_printf/send_error calls replaced by my_error family functions
sql/sql_help.cc:
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed
sql/sql_insert.cc:
  -1/1 (sent/unsent) error reporting removed
  net_printf/send_error calls replaced by my_error family functions
sql/sql_lex.h:
  -1/1 (sent/unsent) error reporting removed
sql/sql_load.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_map.cc:
  errors without code removed
sql/sql_parse.cc:
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed from mysql_execute_command
sql/sql_prepare.cc:
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed
sql/sql_repl.cc:
  error messages fixed
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed
sql/sql_repl.h:
  -1/1 (sent/unsent) error reporting removed
sql/sql_select.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_select.h:
  -1/1 (sent/unsent) error reporting removed
sql/sql_show.cc:
  -1/1 (sent/unsent) error reporting removed
  net_printf/send_error calls replaced by my_error family functions
sql/sql_table.cc:
  net_printf/send_error calls replaced by my_error family functions
  -1/1 (sent/unsent) error reporting removed
sql/sql_trigger.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_udf.cc:
  net_printf/send_error calls replaced by my_error family functions
sql/sql_union.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_update.cc:
  -1/1 (sent/unsent) error reporting removed
  net_printf/send_error calls replaced by my_error family functions
sql/sql_view.cc:
  -1/1 (sent/unsent) error reporting removed
sql/sql_view.h:
  -1/1 (sent/unsent) error reporting removed
sql/sql_yacc.yy:
  net_printf/send_error calls replaced by my_error family functions

1 files changed, 24 insertions, 28 deletions

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 4cdbfe9728b..7894287aee4 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -41,13 +41,12 @@ TYPELIB updatable_views_with_limit_typelib=
     mode	- VIEW_CREATE_NEW, VIEW_ALTER, VIEW_CREATE_OR_REPLACE
 
   RETURN VALUE
-     0	OK
-    -1	Error
-     1	Error and error message given
+     FALSE OK
+     TRUE  Error
 */
 
-int mysql_create_view(THD *thd,
-		      enum_view_create_mode mode)
+bool mysql_create_view(THD *thd,
+                       enum_view_create_mode mode)
 {
   LEX *lex= thd->lex;
   bool link_to_local;
@@ -57,7 +56,7 @@ int mysql_create_view(THD *thd,
   TABLE_LIST *tbl;
   SELECT_LEX *select_lex= &lex->select_lex, *sl;
   SELECT_LEX_UNIT *unit= &lex->unit;
-  int res= 0;
+  bool res= FALSE;
   DBUG_ENTER("mysql_create_view");
 
   if (lex->proc_list.first ||
@@ -66,7 +65,7 @@ int mysql_create_view(THD *thd,
     my_error(ER_VIEW_SELECT_CLAUSE, MYF(0), (lex->result ?
                                              "INTO" :
                                              "PROCEDURE"));
-    res= -1;
+    res= TRUE;
     goto err;
   }
   if (lex->derived_tables ||
@@ -75,7 +74,7 @@ int mysql_create_view(THD *thd,
     my_error((lex->derived_tables ?
               ER_VIEW_SELECT_DERIVED :
               ER_VIEW_SELECT_VARIABLE), MYF(0));
-    res= -1;
+    res= TRUE;
     goto err;
   }
 
@@ -101,7 +100,7 @@ int mysql_create_view(THD *thd,
        (check_access(thd, DELETE_ACL, view->db, &view->grant.privilege,
                      0, 0) ||
         grant_option && check_grant(thd, DELETE_ACL, view, 0, 1, 0))))
-    DBUG_RETURN(1);
+    DBUG_RETURN(TRUE);
   for (sl= select_lex; sl; sl= sl->next_select())
   {
     for (tbl= sl->get_table_list(); tbl; tbl= tbl->next_local)
@@ -119,7 +118,7 @@ int mysql_create_view(THD *thd,
                         thd->priv_user,
                         thd->host_or_ip,
                         tbl->real_name);
-        DBUG_RETURN(-1);
+        DBUG_RETURN(TRUE);
       }
       /*
         Mark this table as a table which will be checked after the prepare
@@ -155,7 +154,7 @@ int mysql_create_view(THD *thd,
                          &tbl->grant.privilege, 0, 0) ||
             grant_option && check_grant(thd, SELECT_ACL, tbl, 0, 1, 0))
         {
-          res= 1;
+          res= TRUE;
           goto err;
         }
       }
@@ -177,8 +176,8 @@ int mysql_create_view(THD *thd,
   }
 #endif
 
-  if ((res= open_and_lock_tables(thd, tables)))
-    DBUG_RETURN(res);
+  if (open_and_lock_tables(thd, tables))
+    DBUG_RETURN(TRUE);
 
   /*
     check that tables are not temporary  and this VIEW do not used in query
@@ -190,7 +189,7 @@ int mysql_create_view(THD *thd,
     if (tbl->table->tmp_table != NO_TMP_TABLE && !tbl->view)
     {
       my_error(ER_VIEW_SELECT_TMPTABLE, MYF(0), tbl->alias);
-      res= -1;
+      res= TRUE;
       goto err;
     }
 
@@ -200,7 +199,7 @@ int mysql_create_view(THD *thd,
         strcmp(tbl->view_name.str, view->real_name) == 0)
     {
       my_error(ER_NO_SUCH_TABLE, MYF(0), tbl->view_db.str, tbl->view_name.str);
-      res= -1;
+      res= TRUE;
       goto err;
     }
 
@@ -220,7 +219,7 @@ int mysql_create_view(THD *thd,
       some errors from prepare are reported to user, if is not then
       it will be checked after err: label
     */
-    res= 1;
+    res= TRUE;
     goto err;
   }
 
@@ -255,7 +254,7 @@ int mysql_create_view(THD *thd,
         if (strcmp(item->name, check->name) == 0)
         {
           my_error(ER_DUP_FIELDNAME, MYF(0), item->name);
-          DBUG_RETURN(-1);
+          DBUG_RETURN(TRUE);
         }
       }
     }
@@ -294,7 +293,7 @@ int mysql_create_view(THD *thd,
                           thd->host_or_ip,
                           item->name,
                           view->real_name);
-          DBUG_RETURN(-1);
+          DBUG_RETURN(TRUE);
         }
       }
     }
@@ -303,7 +302,7 @@ int mysql_create_view(THD *thd,
 
   if (wait_if_global_read_lock(thd, 0, 0))
   {
-    res= -1;
+    res= TRUE;
     goto err;
   }
   VOID(pthread_mutex_lock(&LOCK_open));
@@ -321,9 +320,7 @@ err:
   thd->proc_info= "end";
   lex->link_first_table_back(view, link_to_local);
   unit->cleanup();
-  if (thd->net.report_error)
-    res= -1;
-  DBUG_RETURN(res);
+  DBUG_RETURN(res || thd->net.report_error);
 }
 
 
@@ -824,12 +821,11 @@ err:
     drop_mode	- cascade/check
 
   RETURN VALUE
-     0	OK
-    -1	Error
-     1	Error and error message given
+    FALSE OK
+    TRUE  Error
 */
 
-int mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
+bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
 {
   DBUG_ENTER("mysql_drop_view");
   char path[FN_REFLEN];
@@ -865,11 +861,11 @@ int mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
     VOID(pthread_mutex_unlock(&LOCK_open));
   }
   send_ok(thd);
-  DBUG_RETURN(0);
+  DBUG_RETURN(FALSE);
 
 err:
   VOID(pthread_mutex_unlock(&LOCK_open));
-  DBUG_RETURN(-1);
+  DBUG_RETURN(TRUE);
 
 }