• unknown's avatar
    Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 4a0f5887
    unknown authored
    into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
    
    
    mysql-test/t/events.test:
      Auto merged
    sql/event_queue.cc:
      Auto merged
    sql/events.cc:
      Auto merged
    sql/lex.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    BitKeeper/deleted/.del-mysql_create_system_tables.sh:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    mysql-test/r/events.result:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    mysql-test/r/events_grant.result:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    mysql-test/r/events_restart_phase1.result:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    mysql-test/r/system_mysql_db.result:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    mysql-test/t/events_restart_phase1.test:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    scripts/mysql_system_tables.sql:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    scripts/mysql_system_tables_fix.sql:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    sql/event_data_objects.cc:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    sql/event_data_objects.h:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    sql/event_db_repository.cc:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    sql/event_db_repository.h:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    sql/sql_udf.cc:
      WL#3629 : Replication of Invocation and Invoked Features
      
      Manual merge prior to pushing patches.
    4a0f5887
sql_udf.cc 14.7 KB