Commit d1732a25 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into debian.(none):/M51/mysql-5.1
parents bdf449c5 5c974cf1

mysql-test/r/events.result

+3 −2
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ drop event if exists event1; 
Warnings:

Note	1305	Event event1 does not exist

create event event1 on schedule every 15 minute starts now() ends date_add(now(), interval 5 hour) DO begin end;

alter event event1 rename to event2;

alter event event2 disabled;

alter event event1 rename to event2 enable;

alter event event2 disable;

alter event event2 enable;

alter event event2 on completion not preserve;

alter event event2 on schedule every 1 year on completion preserve rename to event3 comment "new comment" do begin select 1; end__

alter event event3 rename to event2;

mysql-test/t/events.test

+3 −2
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ create database if not exists events_test; 
use events_test;

drop event if exists event1;

create event event1 on schedule every 15 minute starts now() ends date_add(now(), interval 5 hour) DO begin end;

alter event event1 rename to event2;

alter event event2 disabled;

alter event event1 rename to event2 enable;

alter event event2 disable;

alter event event2 enable;

alter event event2 on completion not preserve;

delimiter __;

alter event event2 on schedule every 1 year on completion preserve rename to event3 comment "new comment" do begin select 1; end__

scripts/mysql_fix_privilege_tables.sql

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ CREATE TABLE event ( 
  ends DATETIME default NULL,

  status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',

  on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',

  comment varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  PRIMARY KEY  (db,name)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';

sql/ha_partition.cc

+1 −1
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ void ha_partition::set_up_table_before_create(TABLE *table, 
    return;                                     // Fatal error

  table->s->max_rows= part_elem->part_max_rows;

  table->s->min_rows= part_elem->part_min_rows;

  char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);

  const char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);

  if (part_elem->index_file_name)

    append_file_to_dir(current_thd,

                       (const char**)&part_elem->index_file_name,

sql/lex.h

+0 −2
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ static SYMBOL symbols[] = { 
  { "DETERMINISTIC",    SYM(DETERMINISTIC_SYM)},

  { "DIRECTORY",	SYM(DIRECTORY_SYM)},

  { "DISABLE",		SYM(DISABLE_SYM)},

  { "DISABLED",		SYM(DISABLED_SYM)},

  { "DISCARD",		SYM(DISCARD)},

  { "DISK",		SYM(DISK_SYM)},

  { "DISTINCT",		SYM(DISTINCT)},
@@ -185,7 +184,6 @@ static SYMBOL symbols[] = { 
  { "ELSE",             SYM(ELSE)},

  { "ELSEIF",           SYM(ELSEIF_SYM)},

  { "ENABLE",		SYM(ENABLE_SYM)},

  { "ENABLED",		SYM(ENABLED_SYM)},

  { "ENCLOSED",		SYM(ENCLOSED)},

  { "END",		SYM(END)},

  { "ENDS",		SYM(ENDS_SYM)},