Commit b8ce8ad1 authored by unknown's avatar unknown
Browse files

WL #1034 (Internal CRON) pre-push fixes 

after another merge fixes.


mysql-test/r/information_schema.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/mysqlcheck.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/sp.result:
  WL #1034 (Internal CRON)
  fix result
sql/event.cc:
  after fixes for WL1012 fix these to be able to compile
sql/event_timed.cc:
  after fixes for WL1012 fix these to be able to compile
sql/share/errmsg.txt:
  readd error messages removed during manual update
sql/sql_yacc.yy:
  fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
  merge. The merge wasn't good :(
parent 0d732a14

mysql-test/r/information_schema.result

+2 −2
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); 
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;

CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;

count(*)

105

106

drop view a2, a1;

drop table t_crashme;

select table_schema,table_name, column_name from
@@ -811,7 +811,7 @@ flush privileges; 
SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;

table_schema	count(*)

information_schema	19

mysql	18

mysql	19

create table t1 (i int, j int);

create trigger trg1 before insert on t1 for each row

begin

mysql-test/r/mysqlcheck.result

+2 −0
Original line number Diff line number Diff line 
mysql.columns_priv                                 OK

mysql.db                                           OK

mysql.event                                        OK

mysql.func                                         OK

mysql.help_category                                OK

mysql.help_keyword                                 OK
@@ -18,6 +19,7 @@ mysql.time_zone_transition_type OK 
mysql.user                                         OK

mysql.columns_priv                                 OK

mysql.db                                           OK

mysql.event                                        OK

mysql.func                                         OK

mysql.help_category                                OK

mysql.help_keyword                                 OK

mysql-test/r/sp.result

+2 −0
Original line number Diff line number Diff line
@@ -2116,6 +2116,7 @@ Create view Tables To create new views 
Create user	Server Admin	To create new users

Delete	Tables	To delete existing rows

Drop	Databases,Tables	To drop databases, tables, and views

Event	Server Admin	Creation, alteration, deletion and execution of events.

Execute	Functions,Procedures	To execute stored routines

File	File access on server	To read and write files on the server

Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
@@ -2170,6 +2171,7 @@ Create view Tables To create new views 
Create user	Server Admin	To create new users

Delete	Tables	To delete existing rows

Drop	Databases,Tables	To drop databases, tables, and views

Event	Server Admin	Creation, alteration, deletion and execution of events.

Execute	Functions,Procedures	To execute stored routines

File	File access on server	To read and write files on the server

Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess

sql/event.cc

+5 −5
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ db_create_event(THD *thd, event_timed *et, my_bool create_if_not, 
  if ((ret= evex_fill_row(thd, table, et, false)))

    goto err; 



  if (table->file->write_row(table->record[0]))

  if (table->file->ha_write_row(table->record[0]))

  {

    my_error(ER_EVENT_STORE_FAILED, MYF(0), et->name.str, ret);

    goto err;
@@ -423,8 +423,8 @@ db_create_event(THD *thd, event_timed *et, my_bool create_if_not, 
  {

    thd->clear_error();

    /* Such a statement can always go directly to binlog, no trans cache */

    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);

    mysql_bin_log.write(&qinfo);

    thd->binlog_query(THD::MYSQL_QUERY_TYPE,

                      thd->query, thd->query_length, FALSE, FALSE);

  }

  

  *rows_affected= 1;
@@ -522,7 +522,7 @@ db_update_event(THD *thd, event_timed *et, sp_name *new_name) 
      store(new_name->m_name.str, new_name->m_name.length, system_charset_info);

  }



  if ((ret= table->file->update_row(table->record[1], table->record[0])))

  if ((ret= table->file->ha_update_row(table->record[1], table->record[0])))

  {

    my_error(ER_EVENT_STORE_FAILED, MYF(0), et->name.str, ret);

    goto err;
@@ -853,7 +853,7 @@ evex_drop_event(THD *thd, event_timed *et, bool drop_if_exists, 


  if (!(ret= evex_db_find_event_aux(thd, et->dbname, et->name, table)))

  {

    if ((ret= table->file->delete_row(table->record[0])))

    if ((ret= table->file->ha_delete_row(table->record[0])))

    { 	

      my_error(ER_EVENT_CANNOT_DELETE, MYF(0));

      goto done;

sql/event_timed.cc

+2 −2
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ event_timed::drop(THD *thd) 
  if (evex_db_find_event_aux(thd, dbname, name, table))

    DBUG_RETURN(-2);



  if ((ret= table->file->delete_row(table->record[0])))

  if ((ret= table->file->ha_delete_row(table->record[0])))

    DBUG_RETURN(ret);

    

  close_thread_tables(thd);
@@ -790,7 +790,7 @@ event_timed::update_fields(THD *thd) 
    status_changed= false;

  }

    

  if ((table->file->update_row(table->record[1],table->record[0])))

  if ((table->file->ha_update_row(table->record[1],table->record[0])))

    ret= EVEX_WRITE_ROW_FAILED;



done: