Commit ea8fee76 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into lmy004.:/work/mysql-5.0-clean


mysql-test/r/rpl_delete_all.result:
  Auto merged
mysql-test/t/rpl_delete_all.test:
  Auto merged
parents 04d7dad1 51d1c2ad

mysql-test/lib/init_db.sql

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ CREATE TABLE proc ( 
  security_type     enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL,

  param_list        blob DEFAULT '' NOT NULL,

  returns           char(64) DEFAULT '' NOT NULL,

  body              blob DEFAULT '' NOT NULL,

  body              longblob DEFAULT '' NOT NULL,

  definer           char(77) collate utf8_bin DEFAULT '' NOT NULL,

  created           timestamp,

  modified          timestamp,