1. 31 May, 2006 8 commits
  2. 30 May, 2006 9 commits
    • unknown's avatar
      6cc4424b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · d70dbb08
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      d70dbb08
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6d44290a
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
      
      
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      6d44290a
    • unknown's avatar
      sql/Makefile.am: better mysqld dependencies · 7f115803
      unknown authored
      sql/discover.cc:    close(-1) bug
      sql/slave.cc:       DBUG_ENTER/RETURN tags
      ha_archive.cc:      double-close bug
      
      
      sql/Makefile.am:
        better mysqld dependencies
      sql/discover.cc:
        close(-1) bug
      sql/slave.cc:
        DBUG_ENTER/RETURN tags
      storage/archive/ha_archive.cc:
        double-close bug
      7f115803
    • unknown's avatar
      reduce error log spamming by old privilege tables. If they're old, · 4f29f5a8
      unknown authored
      report it once, don't whine about every missing column.
      
      4f29f5a8
    • unknown's avatar
      Now ftparser does not need to bother about memory management - · 199ee891
      unknown authored
      it can tell MySQL to make a copy of everything (bug#17123)
      
      
      include/mysql/plugin.h:
        Now ftparser does not need to bother about memory management -
        it can tell MySQL to make a copy of everything (bug#17123)
        MYSQL_FTFLAGS_NEED_COPY flag
      storage/myisam/ft_boolean_search.c:
        param->flags
      storage/myisam/ft_nlq_search.c:
        param->flags. ft_parse takes a mem_root as an argument
      storage/myisam/ft_parser.c:
        ftparser takes a memroot as an argument. words are copied there, if necessary.
        memroot is reset for every parsing and free'd at the end of the statement.
      storage/myisam/ft_update.c:
        ftparser takes a memroot as an argument. words are copied there, if necessary.
        memroot is reset for every parsing and free'd at the end of the statement.
      storage/myisam/ftdefs.h:
        ftparser takes a memroot as an argument. words are copied there, if necessary.
        memroot is reset for every parsing and free'd at the end of the statement.
      storage/myisam/mi_check.c:
        ftparser takes a memroot as an argument. words are copied there, if necessary
      storage/myisam/myisamdef.h:
        memroot for ftparser in MI_INFO and MI_SORT_PARAM
      storage/myisam/sort.c:
        free ftparser memroot
      199ee891
    • unknown's avatar
      Merge gbichot@bk-internal:/home/bk/mysql-5.1-new · d16e9bf0
      unknown authored
      into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      d16e9bf0
    • unknown's avatar
      update show authors · b89c4e23
      unknown authored
      b89c4e23
  3. 29 May, 2006 10 commits
    • unknown's avatar
      Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2cfb77cd
      unknown authored
      into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
      
      2cfb77cd
    • unknown's avatar
      a271b486
    • unknown's avatar
      update show authors · 1046fc02
      unknown authored
      1046fc02
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.1-new-vanilla · 1ee67618
      unknown authored
      into lmy004.:/work/mysql-5.1-runtime
      
      1ee67618
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · bfa16823
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      mysql-test/t/information_schema.test:
        Merge
      mysql-test/t/wait_timeout.test:
        Merge
      sql/mysqld.cc:
        Merge
      sql/slave.cc:
        Null merge
      sql/sp_head.cc:
        Merge
      bfa16823
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 8e12d72f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      sql/mysqld.cc:
        Auto merged
      8e12d72f
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.1-new-vanilla · 008ff030
      unknown authored
      into lmy004.:/work/mysql-5.1-runtime
      
      
      sql/event_scheduler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      008ff030
    • unknown's avatar
      add missing events_grant test · 535ec4ea
      unknown authored
      535ec4ea
    • unknown's avatar
      local variable interval to interval_tmp because it hides · 3a4146dc
      unknown authored
      Event_timed::interval
      
      3a4146dc
    • unknown's avatar
      Fix for bug #17394 - Events namespace is wrong · c7d7c47d
      unknown authored
      
      mysql-test/lib/init_db.sql:
        remove definer from PK
      mysql-test/r/events.result:
        update results
      mysql-test/r/system_mysql_db.result:
        update results
      mysql-test/t/events.test:
        remove I_S.EVENTS test and move it to events_grant.test
      scripts/mysql_fix_privilege_tables.sql:
        change table definition
      sql/event.cc:
        make events non-user specific (namespace change)
      sql/event.h:
        make events non-user specific (namespace change)
      sql/event_priv.h:
        make events non-user specific (namespace change)
      sql/event_scheduler.cc:
        make events non-user specific (namespace change)
      sql/event_timed.cc:
        make events non-user specific (namespace change)
      sql/sql_parse.cc:
        make events non-user specific (namespace change)
      sql/sql_show.cc:
        SHOW EVENTS is available to everyone who has EVENT on specific schema.
        No additional privileges are needed to see others' events.
        - user A has events in db1 and db2
        - user B has events in db1 and db3
        A will see all his events from db1 and db2 as well as B's events
        from db1 but not from db3.
        B will see her events from db1 and db3. In addition B will see
        only A's events from db1 but not db2.
      c7d7c47d
  4. 28 May, 2006 3 commits
    • unknown's avatar
      Incompatible ftparser plugin API change. · 72c7dfe6
      unknown authored
      mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
      not a mysql_ftparam.
      
      
      client/Makefile.am:
        don't fail when rm cannot delete from read-only dir
      sql/sql_plugin.cc:
        fix min_plugin_info_interface_version to be less error-prone
      72c7dfe6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · c2ee0aa1
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      c2ee0aa1
    • unknown's avatar
      handlerton cleanup: · 0aad8083
      unknown authored
      duplicate fields removed, st_mysql_storage_engine added to support
      run-time handlerton initialization (no compiler warnings), handler API
      is now tied to MySQL version, handlerton->plugin mapping added
      (slot-based), dummy default_hton removed, plugin-type-specific
      initialization generalized, built-in plugins are now initialized too,
      --default-storage-engine no longer needs a list of storage engines
      in handle_options().
      
      mysql-test-run.pl bugfixes
      
      
      include/mysql/plugin.h:
        added st_mysql_storage_engine
        made handlerton tied to MySQL version
      mysql-test/mysql-test-run.pl:
        bugfixes (umask, --no-defaults)
      mysql-test/r/ndb_dd_basic.result:
        update error message
      mysql-test/t/partition_mgm_err2.test:
        fix typo
      sql/ha_berkeley.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_berkeley.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_federated.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_heap.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_innodb.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_innodb.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_myisam.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_myisammrg.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster_binlog.cc:
        no 'name' in the handlerton anymore
      sql/ha_partition.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/handler.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        handlerton->plugin mapping
      sql/handler.h:
        handlerton cleanup: remove duplicate fields
      sql/log.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/mysql_priv.h:
        handler.h needs plugin.h
      sql/mysqld.cc:
        Convert --default-storage-engine to a handlerton* when
        all storage engines are initialized and not in getopt
      sql/set_var.cc:
        no name in the handlerton anymore
      sql/sql_parse.cc:
        no default_hton anymore
      sql/sql_partition.cc:
        no name in the handlerton anymore
      sql/sql_plugin.cc:
        generalize plugin type-specific initialization.
        initialize built-in plugins too
      sql/sql_plugin.h:
        generalize plugin type-specific initialization.
      sql/sql_show.cc:
        st_mysql_storage_engine structure
        no name in the handlerton anymore
      sql/sql_table.cc:
        no name in the handlerton anymore
        no default_hton anymore
      sql/sql_tablespace.cc:
        no name in the handlerton anymore
        no default_hton anymore
      sql/sql_yacc.yy:
        no default_hton anymore
        issue "unknown storage engine" warning where it is discovered
      storage/archive/ha_archive.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/archive/ha_archive.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/blackhole/ha_blackhole.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/csv/ha_tina.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/example/ha_example.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      0aad8083
  5. 27 May, 2006 2 commits
  6. 26 May, 2006 4 commits
  7. 25 May, 2006 4 commits