1. 21 Dec, 2005 10 commits
    • unknown's avatar
      plugin version changes · c3c43e12
      unknown authored
      
      include/plugin.h:
        relocate version
      sql/handler.cc:
        no version checks here
      sql/handler.h:
        version is kinda short
      sql/sql_show.cc:
        version is a short, rearrange and show all
      storage/csv/ha_tina.cc:
        rearrange version
      storage/example/ha_example.cc:
        rearrange version
      c3c43e12
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/mysql-5.1 · 5459c970
      unknown authored
      into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
      
      
      configure.in:
        Auto merged
      mysql-test/r/bdb.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/bdb.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_sum.cc:
        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_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/sql_table.cc:
        SCCS merged
      5459c970
    • unknown's avatar
      Finalize storage engine plugins · 613dd50a
      unknown authored
      Give BerkeleyDB savepoints
      Remove "enum db_type" from most of the code
      
      
      storage/example/ha_example.h:
        Rename: sql/examples/ha_example.h -> storage/example/ha_example.h
      storage/csv/ha_tina.h:
        Rename: sql/examples/ha_tina.h -> storage/csv/ha_tina.h
      config/ac-macros/storage.m4:
        if hton name is "no", then we don't install it as a builtin
      configure.in:
        pluggable changes
      include/plugin.h:
        version field
      mysql-test/r/bdb.result:
        savepoint results copied from innodb test
      mysql-test/r/information_schema.result:
        PLUGINS information schema
      mysql-test/r/information_schema_db.result:
        PLUGINS information schema
      mysql-test/t/bdb.test:
        savepoint test copied from innodb test
      sql/Makefile.am:
        tina and example are not here anymore
      sql/authors.h:
        minor tweek
      sql/ha_archive.cc:
        remove unwanted handlerton entries
      sql/ha_berkeley.cc:
        remove unwanted handlerton entries
        support for savepoints
        changes to show logs
      sql/ha_blackhole.cc:
        remove unwanted handlerton entries
      sql/ha_federated.cc:
        remove unwanted handlerton entries
      sql/ha_heap.cc:
        remove unwanted handlerton entries
      sql/ha_innodb.cc:
        remove unwanted handlerton entries
        changes for show status
      sql/ha_myisam.cc:
        remove unwanted handlerton entries
      sql/ha_myisammrg.cc:
        remove unwanted handlerton entries
      sql/ha_ndbcluster.cc:
        remove unwanted handlerton entries
        changes to stat_print
      sql/ha_partition.cc:
        remove unwanted handlerton entries
        bye bye enum db_type
      sql/ha_partition.h:
        bye bye enum db_type
      sql/handler.cc:
        remove unwanted handlerton entries
        bye bye enum db_type
      sql/handler.h:
        remove unwanted handlerton entries
        bye bye enum db_type
        changes to stat_print_fn
      sql/item_sum.cc:
        bye bye enum db_type
      sql/log.cc:
        remove unwanted handlerton entries
      sql/mysql_priv.h:
        bye bye enum db_type
      sql/mysqld.cc:
        bye bye enum db_type
        reorder plugin initialization
      sql/set_var.cc:
        bye bye enum db_type
      sql/set_var.h:
        bye bye enum db_type
      sql/sql_base.cc:
        bye bye enum db_type
      sql/sql_cache.cc:
        bye bye enum db_type
      sql/sql_class.h:
        bye bye enum db_type
      sql/sql_delete.cc:
        bye bye enum db_type
      sql/sql_insert.cc:
        bye bye enum db_type
      sql/sql_lex.h:
        show plugin
      sql/sql_parse.cc:
        bye bye enum db_type
      sql/sql_partition.cc:
        bye bye enum db_type
      sql/sql_plugin.cc:
        loadable storage engines
      sql/sql_plugin.h:
        loadable storage engines
      sql/sql_rename.cc:
        bye bye enum db_type
      sql/sql_select.cc:
        bye bye enum db_type
      sql/sql_show.cc:
        SHOW PLUGIN
        PLUGINS information schema
        changes to show engines
      sql/sql_table.cc:
        bye bye enum db_type
      sql/sql_view.cc:
        bye bye enum db_type
      sql/sql_view.h:
        bye bye enum db_type
      sql/sql_yacc.yy:
        bye bye enum db_type
      sql/table.cc:
        bye bye enum db_type
      sql/table.h:
        bye bye enum db_type
      sql/unireg.cc:
        bye bye enum db_type
      storage/csv/ha_tina.cc:
        make tina into a loadable plugin
      storage/example/ha_example.cc:
        make into a plugin
      storage/csv/Makefile.am:
        New BitKeeper file ``storage/csv/Makefile.am''
      storage/example/Makefile.am:
        New BitKeeper file ``storage/example/Makefile.am''
      613dd50a
    • unknown's avatar
      Raise the version number. · ec6121fb
      unknown authored
      ec6121fb
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 23ab8a3a
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new.xml
      
      
      23ab8a3a
    • unknown's avatar
      Adding XPath support: ExtractValue and UpdateXML functions. · 5e4c3ce6
      unknown authored
      libmysqld/Makefile.am:
      sql/Makefile.am:
        Adding new source files.
        Adding new file into build process.
      include/my_xml.h:
      strings/xml.c:
        Adding new XML parse flags to skip text normalization and 
        to use relative tag names. Adding enum for XML token types.
      sql/lex.h:
        Making parser aware of new SQL functions.
      sqll/item_create.h, sql/item_create.cc:
        Adding creators for ExtractValue and UpdateXML.
      sql/item.h:
        Adding new Item types: nodeset and nodeset comparator.
      sql/item_xmlfunc.h
      sql/item_xmlfunc.cc
        Adding new classes implementing XPath functions.
      mysql-test/t/xml.test, mysql-test/r/xml.result:
        New files: adding test case
      
      
      include/my_xml.h:
        Adding ExtractValue and UpdateXML functions.
        Adding XML parser flags and enum for XML token types.
      sql/Makefile.am:
        Adding new source files.
      sql/item.h:
        Adding new Item types: nodeset and nodeset comparator.
      sql/item_create.cc:
        Adding creators for ExtractValue and UpdateXML.
      sql/item_create.h:
        Adding creators for ExtractValue and UpdateXML.
      sql/lex.h:
        Make parse aware of new SQL functions.
      strings/xml.c:
        Adding new flags to skip text normalization and 
        to use relative tag names.
      libmysqld/Makefile.am:
        Adding new file into build process.
      5e4c3ce6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 6e8b3484
      unknown authored
      into melody.mysql.com:/home/vadim/mysql-5.1-new
      
      
      6e8b3484
    • unknown's avatar
      mysql-test-run.pl: · 14b62752
      unknown authored
        Don't run "mysqlslap" on Windows
      mysqlslap.test:
        We don't run "mysqlslap" on Windows
      mysql.sln:
        Removed build of "client/mysqlslap.c" on Windows
      
      
      VC++Files/mysql.sln:
        Removed build of "client/mysqlslap.c" on Windows
      mysql-test/t/mysqlslap.test:
        We don't run "mysqlslap" on Windows
      mysql-test/mysql-test-run.pl:
        Don't run "mysqlslap" on Windows
      14b62752
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5d853f5f
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      5d853f5f
    • unknown's avatar
      Minor portability issue on big endian boxes · 3bf3304c
      unknown authored
      3bf3304c
  2. 20 Dec, 2005 4 commits
  3. 19 Dec, 2005 11 commits
    • unknown's avatar
      my_sys.h: · e0d9f5bd
      unknown authored
        Added MAP_NORESERVE set to 0 for Windows
      config-win.h:
        If MAX_INDEXES is not set, set it to 64 on Windows
      
      
      include/config-win.h:
        If MAX_INDEXES is not set, set it to 64 on Windows
      include/my_sys.h:
        Added MAP_NORESERVE set to 0 for Windows
      e0d9f5bd
    • unknown's avatar
      sql_trigger.cc, item.cc: · 5f410092
      unknown authored
        BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-UX 11.23
        Fix: make explicit conversion to non-constant string (char *)
        (change by anozdrin@mysql.com)
      
      
      sql/item.cc:
        Make explicit conversion to non-constant string (char *)
      sql/sql_trigger.cc:
        Make explicit conversion to non-constant string (char *)
      5f410092
    • unknown's avatar
      my_global.h: · a62aaaef
      unknown authored
        Fix for bug #15841: Change in sql_map.cc and mmap breaks on HP-UX
        - in order to enable the mmap64() (and others) define
        _LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX.
      
      
      include/my_global.h:
        Fix for bug #15841: Change in sql_map.cc and mmap breaks on HP-UX
        - in order to enable the mmap64() (and others) define
        _LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX.
      a62aaaef
    • unknown's avatar
      Bug fix for bug #15843 "Added mmap support in myisam creates compile problem · ec7a7ac2
      unknown authored
      on AIX 5.2"
      
      Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
      removed duplicates
      
      my_sys.h:
        added definition for MAP_NORESERVE
        (for Irix and AIX systems)
      sql_map.cc:
        removed definition of MAP_NORESERVE
      mi_packrec.c:
        removed definition of MAP_NORESERVE and MMAP_PRIVATE
      
      
      storage/myisam/mi_packrec.c:
        removed definition of MAP_NORESERVE and MMAP_PRIVATE
      sql/sql_map.cc:
        removed definition of MAP_NORESERVE
      include/my_sys.h:
        added definition for MAP_NORESERVE
        (for Irix and AIX systems)
      ec7a7ac2
    • unknown's avatar
      mysql-test/t/federated_transactions.test · 32279956
      unknown authored
          Fix a typo: Trailing ";" for "source" command.
      
      
      mysql-test/t/federated_transactions.test:
        Fix a typo: Trailing ";" for "source" command.
      32279956
    • unknown's avatar
      Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e57903f5
      unknown authored
      into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
      
      
      extra/Makefile.am:
        Auto merged
      e57903f5
    • unknown's avatar
      federated_transactions.test: · a466e280
      unknown authored
        Test require Berkeley DB
      
      
      mysql-test/t/federated_transactions.test:
        Test require Berkeley DB
      a466e280
    • unknown's avatar
      Merge · b39c4c77
      unknown authored
      b39c4c77
    • unknown's avatar
      mysql-test-run.pl: · 21620190
      unknown authored
        Script "my_print_defaults" is to be searched for as executable
      
      
      mysql-test/mysql-test-run.pl:
        Script "my_print_defaults" is to be searched for as executable
      21620190
    • unknown's avatar
      disabled.def: · f6160c7d
      unknown authored
        Disabled 'type_time' until 15805 is closed
      
      
      mysql-test/t/disabled.def:
        Disabled 'type_time' until 15805 is closed
      f6160c7d
    • unknown's avatar
      mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln: · 2a5aa3f2
      unknown authored
        Added "client/mysqlslap"
      mysqlslap.vcproj, mysqlslap.def:
        new file
      
      
      VC++Files/mysql.sln:
        Added "client/mysqlslap"
      netware/Makefile.am:
        Added "client/mysqlslap"
      scripts/make_binary_distribution.sh:
        Added "client/mysqlslap"
      support-files/mysql.spec.sh:
        Added "client/mysqlslap"
      2a5aa3f2
  4. 18 Dec, 2005 6 commits
    • unknown's avatar
      Merge · a5ecdeba
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/r/ndb_multi.result:
        Auto merged
      mysql-test/r/skip_name_resolve.result:
        Auto merged
      mysql-test/r/type_time.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      mysql-test/t/ndb_multi.test:
        Auto merged
      mysql-test/t/skip_name_resolve.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      storage/ndb/src/ndbapi/NdbImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbRecAttr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      zlib/Makefile.am:
        Auto merged
      a5ecdeba
    • unknown's avatar
      Merge · 2de5c141
      unknown authored
      
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/r/ndb_multi.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      mysql-test/t/ndb_multi.test:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      2de5c141
    • unknown's avatar
      Makefile.am: · a3a5df43
      unknown authored
        Added 5.0 specific build scripts
      
      
      BUILD/Makefile.am:
        Added 5.0 specific build scripts
      a3a5df43
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · de1c06b9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      BUILD/Makefile.am:
        Auto merged
      de1c06b9
    • unknown's avatar
      Merge · aa6d8551
      unknown authored
      aa6d8551
    • unknown's avatar
      Makefile.am: · e97a4a4a
      unknown authored
        Adjusted listing of files to put into source TAR
      
      
      e97a4a4a
  5. 17 Dec, 2005 1 commit
  6. 16 Dec, 2005 6 commits
  7. 15 Dec, 2005 2 commits