1. 27 Dec, 2005 1 commit
  2. 23 Dec, 2005 2 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2c88b639
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-5.1
      
      
      configure.in:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      storage/Makefile.am:
        Hand merge of the Makefile.am changes (I assume Antony pushed loadable).
      2c88b639
    • unknown's avatar
      Update to add in support for AZIO. · 93b3d4ef
      unknown authored
      AZIO differs in that it uses mysys methods and removes all of the malloc calls. 
      
      
      configure.in:
        Update for new archive directory
      libmysqld/Makefile.am:
        Adding archive storage directory.
      sql/Makefile.am:
        Adding archive library.
      sql/ha_archive.cc:
        Update for ha_archive to use azio.
      sql/ha_archive.h:
        Updates to support azio.
      storage/Makefile.am:
        Added archive directory.
      storage/archive/Makefile.am:
        New BitKeeper file ``storage/archive/Makefile.am''
      storage/archive/archive_test.c:
        New BitKeeper file ``storage/archive/archive_test.c''
      storage/archive/azio.c:
        New BitKeeper file ``storage/archive/azio.c''
      storage/archive/azlib.h:
        New BitKeeper file ``storage/archive/azlib.h''
      93b3d4ef
  3. 22 Dec, 2005 10 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2f7d0416
      unknown authored
      into  zim.(none):/home/brian/mysql/cluster-5.1
      
      
      libmysqld/Makefile.am:
        Auto merged
      2f7d0416
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new · b35aaa27
      unknown authored
      into  mysql.com:/home/bk/b15920-mysql-5.1-new
      
      
      b35aaa27
    • unknown's avatar
      WL#1012 Add to sql/Makefile.am include files forgotten in RBR push. · 90c221be
      unknown authored
      Remove errorneously committed ChangeLog file.
      
      
      BitKeeper/deleted/.del-ChangeLog~408d3fd6ba89dd59:
        Delete: ChangeLog
      sql/Makefile.am:
        Add missing include files forgotten in RBR push.
      90c221be
    • unknown's avatar
    • unknown's avatar
      Bug#15920 (Temporary tables are not logged in binlog): · 449b679d
      unknown authored
        Fixing faulty tests preventing some CREATE TEMPORARY TABLE statements
        from being binlogged under statement-based replication.
      
      
      mysql-test/t/disabled.def:
        Enabling rpl000002 test.
      sql/sql_table.cc:
        Changed faulty tests so that creation of temporary tables are always done
        when statement-based logging is used.
      449b679d
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 69221bba
      unknown authored
      into  zim.(none):/home/brian/mysql/cluster-5.1
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/information_schema_db.result:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      69221bba
    • unknown's avatar
      This patch does the following: · 67c96c78
      unknown authored
      1) Fixes breakage in embedded server build for XMLPath push.
      2) Hides PARTITION engine from view.
      3) Add ENGINES information schema (and it should now be clear from this patch on how to turn any show command into an information schema).
      
      
      libmysqld/Makefile.am:
        Fix for embedded server to build.
      mysql-test/r/information_schema.result:
        Fix for additional information_schema
      mysql-test/r/information_schema_db.result:
        Fix for adding additional engines information schema.
      mysql-test/t/information_schema.test:
        Added test to make sure that engines information schema works.
      sql/ha_partition.cc:
        Made PARTITION hidden in information schema.
      sql/sql_parse.cc:
        Added additional case for engine information schema.
      sql/sql_show.cc:
        Code for ENGINES information schema.
      sql/sql_yacc.yy:
        Extended grammer to support new ENGINES information schema
      sql/table.h:
        Comment on dependency in information schema.
      libmysqld/item_xmlfunc.cc:
        New BitKeeper file ``libmysqld/item_xmlfunc.cc''
      67c96c78
    • unknown's avatar
      Fix compile problem in ha_example.cc · 973949d0
      unknown authored
      973949d0
    • unknown's avatar
      WL#1012 Missed option file · e2283810
      unknown authored
      
      mysql-test/t/binlog_row_innodb_stat-master.opt:
        missed option file
      e2283810
    • unknown's avatar
      WL#1012: All changes as one single changeset. · 09346e6e
      unknown authored
      This includes both code and test cases.
      
      
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Delete: mysql-test/r/ctype_ucs_binlog.result
      BitKeeper/deleted/.del-rpl_delete_all.result~7c050d592614b3f:
        Delete: mysql-test/r/rpl_delete_all.result
      BitKeeper/deleted/.del-rpl000013-slave.opt~18266ad8a2403e8d:
        Delete: mysql-test/t/rpl000013-slave.opt
      BitKeeper/deleted/.del-rpl_delete_all.test~700a1490277780e0:
        Delete: mysql-test/t/rpl_delete_all.test
      mysql-test/extra/binlog_tests/binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/blackhole.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_ddl.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_loaddata_m.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_log.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_EE_err.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_user_variables.test:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_binlog.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_blackhole.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_cp932.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_insert_select.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000012.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000015.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_deadlock_innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_flushlog_loop.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata_s.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_000001.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_EE_err.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_charset.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_ddl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_err_ignoredtable.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_loaddata_m.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_log.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_max_relay_size.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_multi_query.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_mystery22.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_reset_slave.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_rewrt_db.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_sp.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_timezone.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_until.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_user_variables.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_view.result:
        Import patch wl1012.patch
      mysql-test/t/binlog_row_binlog-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_000012.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.slave-mi:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_deadlock_innodb-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_000001-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_err_ignoredtable-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_loaddata_m-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_mystery22.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-slave.opt:
        Import patch wl1012.patch
      BUILD/SETUP.sh:
        Import patch wl1012.patch
      Makefile.am:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_until.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_view.test:
        Import patch wl1012.patch
      client/Makefile.am:
        Import patch wl1012.patch
      client/client_priv.h:
        Import patch wl1012.patch
      client/mysqlbinlog.cc:
        Import patch wl1012.patch
      configure.in:
        Import patch wl1012.patch
      include/Makefile.am:
        Import patch wl1012.patch
      include/base64.h:
        Import patch wl1012.patch
      include/config-win.h:
        Import patch wl1012.patch
      include/my_base.h:
        Import patch wl1012.patch
      include/my_global.h:
        Import patch wl1012.patch
      mysql-test/Makefile.am:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.pl:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.sh:
        Import patch wl1012.patch
      mysql-test/r/date_formats.result:
        Import patch wl1012.patch
      mysql-test/r/flush_block_commit.result:
        Import patch wl1012.patch
      mysql-test/r/innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl000017.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_change_master.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_commit_after_flush.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_create_database.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_do_grant.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_log_pos.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_delete.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_update.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_openssl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_replicate_do.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_rotate_logs.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id1.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id2.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_temporary.result:
        Import patch wl1012.patch
      mysql-test/r/user_var-binlog.result:
        Import patch wl1012.patch
      mysql-test/t/create_select_tmp.test:
        Import patch wl1012.patch
      mysql-test/t/date_formats.test:
        Import patch wl1012.patch
      mysql-test/t/disabled.def:
        Import patch wl1012.patch
      mysql-test/t/innodb.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000002.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000006.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000013.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000017.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_auto_increment.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_change_master.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_commit_after_flush.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_create_database.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_do_grant.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_drop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_empty_master_crash.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_failed_optimize.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_heap.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_id.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_ignore.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_log_pos.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_delete.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update3.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_openssl.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_redirect.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_relayrotate.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_replicate_do.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_rotate_logs.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_server_id1.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_sp_effects.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_temporary.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_trigger.test:
        Import patch wl1012.patch
      mysql-test/t/sp.test:
        Import patch wl1012.patch
      mysql-test/t/user_var-binlog.test:
        Import patch wl1012.patch
      mysys/Makefile.am:
        Import patch wl1012.patch
      mysys/base64.c:
        Import patch wl1012.patch
      sql/Makefile.am:
        Import patch wl1012.patch
      sql/ha_innodb.cc:
        Import patch wl1012.patch
      sql/ha_innodb.h:
        Import patch wl1012.patch
      sql/ha_partition.cc:
        Import patch wl1012.patch
      sql/handler.cc:
        Import patch wl1012.patch
      sql/handler.h:
        Import patch wl1012.patch
      sql/item_sum.cc:
        Import patch wl1012.patch
      sql/log.cc:
        Import patch wl1012.patch
      sql/log_event.cc:
        Import patch wl1012.patch
      sql/log_event.h:
        Import patch wl1012.patch
      sql/mysql_priv.h:
        Import patch wl1012.patch
      sql/mysqld.cc:
        Import patch wl1012.patch
      sql/rpl_filter.h:
        Import patch wl1012.patch
      sql/set_var.cc:
        Import patch wl1012.patch
      sql/share/errmsg.txt:
        Import patch wl1012.patch
      sql/slave.cc:
        Import patch wl1012.patch
      sql/slave.h:
        Import patch wl1012.patch
      sql/sp.cc:
        Import patch wl1012.patch
      sql/sp_head.cc:
        Import patch wl1012.patch
      sql/sql_acl.cc:
        Import patch wl1012.patch
      sql/sql_base.cc:
        Import patch wl1012.patch
      sql/sql_class.cc:
        Import patch wl1012.patch
      sql/sql_class.h:
        Import patch wl1012.patch
      sql/sql_delete.cc:
        Import patch wl1012.patch
      sql/sql_insert.cc:
        Import patch wl1012.patch
      sql/sql_lex.h:
        Import patch wl1012.patch
      sql/sql_list.h:
        Import patch wl1012.patch
      sql/sql_load.cc:
        Import patch wl1012.patch
      sql/sql_parse.cc:
        Import patch wl1012.patch
      sql/sql_plugin.cc:
        Import patch wl1012.patch
      sql/sql_rename.cc:
        Import patch wl1012.patch
      sql/sql_repl.h:
        Import patch wl1012.patch
      sql/sql_select.cc:
        Import patch wl1012.patch
      sql/sql_show.cc:
        Import patch wl1012.patch
      sql/sql_table.cc:
        Import patch wl1012.patch
      sql/sql_udf.cc:
        Import patch wl1012.patch
      sql/sql_union.cc:
        Import patch wl1012.patch
      sql/sql_update.cc:
        Import patch wl1012.patch
      sql/sql_yacc.yy:
        Import patch wl1012.patch
      sql/table.cc:
        Import patch wl1012.patch
      sql/table.h:
        Import patch wl1012.patch
      storage/innobase/include/lock0lock.h:
        Import patch wl1012.patch
      storage/innobase/include/row0mysql.h:
        Import patch wl1012.patch
      storage/innobase/include/row0vers.h:
        Import patch wl1012.patch
      storage/innobase/lock/lock0lock.c:
        Import patch wl1012.patch
      storage/innobase/row/row0mysql.c:
        Import patch wl1012.patch
      storage/innobase/row/row0sel.c:
        Import patch wl1012.patch
      storage/innobase/row/row0vers.c:
        Import patch wl1012.patch
      09346e6e
  4. 21 Dec, 2005 12 commits
    • unknown's avatar
      Change for plugin storage engine to be built after mysqld · 65c560e9
      unknown authored
      
      Makefile.am:
        Change build order for plugins
      config/ac-macros/storage.m4:
        Change build order for plugins
      configure.in:
        Change build order for plugins
      storage/Makefile.am:
        add csv and example to dist
      storage/csv/Makefile.am:
        remove unneeded dep
      storage/example/Makefile.am:
        remove unneeded dep
      65c560e9
    • unknown's avatar
      Fix for plugins work · 597dc9a8
      unknown authored
      
      storage/csv/Makefile.am:
        Build currently depends on sql/sql_yacc.h
      storage/example/Makefile.am:
        Build currently depends on sql/sql_yacc.h
      storage/example/ha_example.cc:
        remove old handlerton entries
      597dc9a8
    • 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
  5. 20 Dec, 2005 4 commits
  6. 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