database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

post-merge fixes of bug 16548

Browse Source 
mysql-test/r/events.result:
  post-merge fixes
mysql-test/t/events.test:
  post-merge fixes
sql/event.cc:
  post-merge fixes
sql/share/errmsg.txt:
  post-merge fixes
sql/table.cc:
  post-merge fixes
This commit is contained in:
unknown
2006-02-14 20:10:51 +01:00
parent 7b9223fcc1
commit 99526f2efb
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/event.cc
View File

@ -141,7 +141,6 @@ static TABLE_FIELD_W_TYPE event_table_fields[EVEX_FIELD_COUNT] = {
{(char *) STRING_WITH_LEN("enum('DROP','PRESERVE')")},
{NULL, 0}
},
/*
{
{(char *) STRING_WITH_LEN("sql_mode")},
{(char *) STRING_WITH_LEN("set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES',"
@ -154,7 +153,6 @@ static TABLE_FIELD_W_TYPE event_table_fields[EVEX_FIELD_COUNT] = {
"'HIGH_NOT_PRECEDENCE')")},
{NULL, 0}
},
*/
{
{(char *) STRING_WITH_LEN("comment")},
{(char *) STRING_WITH_LEN("char(64)")},
@ -440,7 +438,7 @@ common_1_lev_code:
case INTERVAL_HOUR_MICROSECOND:
case INTERVAL_MINUTE_MICROSECOND:
case INTERVAL_SECOND_MICROSECOND:
my_error(ER_NOT_SUPPORTED_YET, MYF(0));
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "MICROSECOND");
return 1;
break;
case INTERVAL_QUARTER: