1. 20 Apr, 2006 1 commit
    • unknown's avatar
      WL#3201 · a7dde923
      unknown authored
        Fixes after first review
      
      
      config/ac-macros/ha_ndbcluster.m4:
        WL#3201
          Undo change
      config/ac-macros/plugins.m4:
        WL#3201
          Remove unneccesary use of AC_DEFUN
          fix shell script to be more portable
      configure.in:
        WL#3201
          Remove use of word "engine" when desribing partition module
          Undo ndb config files change
      sql/ha_partition.cc:
        WL#3201
          Remove use of word "engine" when desribing partition module
      sql/handler.cc:
        WL#3201
          Add comment describing installed_htons array
      a7dde923
  2. 13 Apr, 2006 1 commit
    • unknown's avatar
      WL#3201 · 83583111
      unknown authored
        " Configure support for server plugins "
      
      
      storage/blackhole/ha_blackhole.h:
        Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h
      BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad:
        Delete: config/ac-macros/storage.m4
      BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294:
        Delete: config/ac-macros/ha_archive.m4
      BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed:
        Delete: config/ac-macros/ha_blackhole.m4
      BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708:
        Delete: config/ac-macros/ha_example.m4
      BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6:
        Delete: config/ac-macros/ha_federated.m4
      BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39:
        Delete: config/ac-macros/ha_innodb.m4
      BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89:
        Delete: config/ac-macros/ha_partition.m4
      BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca:
        Delete: config/ac-macros/ha_tina.m4
      BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc:
        Delete: sql/handlerton.cc.in
      BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
        Delete: sql/handlerton-win.cc
      BUILD/SETUP.sh:
        WL#3201
          Changes in configure arguments
      Makefile.am:
        WL#3201
          changes in build subst names
      config/ac-macros/ha_berkeley.m4:
        WL#3201
          remove unused variable
          Makefile is always made
      config/ac-macros/ha_ndbcluster.m4:
        WL#3201
          remove unused variables
          Split big macro
      configure.in:
        WL#3201
          out with storage.m4, in with plugins.m4
          change how plugins are declared
          include makefiles, remove handlerton.cc, add sql_builtin.cc
      include/mysql/plugin.h:
        WL#3201
          support static and dynamic build - MYSQL_DYNAMIC_PLUGIN
      libmysqld/Makefile.am:
        WL#3201
          Storage engine files still left in sql subdir are not conditionally
          compiled. Should move them out soon,
      plugin/Makefile.am:
        WL#3201
          update makefile
      plugin/fulltext/Makefile.am:
        WL#3201
          update makefile
      plugin/fulltext/plugin_example.c:
        WL#3201
          change to mysql_declare_plugin macro
      sql/Makefile.am:
        WL#3201
          Storage engine files still left in sql subdir are not conditionally
          compiled. Should move them out soon,
      sql/ha_berkeley.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_federated.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_heap.cc:
        WL#3201
          make into a plugin
      sql/ha_innodb.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_myisam.cc:
        WL#3201
          make into a plugin
      sql/ha_myisammrg.cc:
        WL#3201
          make into a plugin
      sql/ha_ndbcluster.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_ndbcluster_binlog.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_partition.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/handler.cc:
        WL#3201
          Simplify how storage engines are found by db_type
          (hopefully we can get rid of it soon)
          Code cleanup
      sql/handler.h:
        WL#3201
          new DB_TYPE_FIRST_DYNAMIC
          new func ha_finalize_handlerton()
          remove ha_register_builtin_plugins()
      sql/log.cc:
        WL#3201
          make into a plugin
      sql/mysqld.cc:
        WL#3201
          remove ha_register_builtin_plugins()
          alter init order so that storage engines are initialized before first use
      sql/partition_info.cc:
        WL#3201
          conditionally compile content
      sql/sql_delete.cc:
        WL#3201
          conditionally include ha_innodb.h
      sql/sql_plugin.cc:
        WL#3201
          All compiled in plugins are in mysqld_builtins[]
          add funcs for plugin finalization
          install builtin plugins on initialization
      sql/sql_show.cc:
        WL#3201
          Fix to use plugin_foreach()
      sql/sql_yacc.yy:
        WL#3201
          SHOW FULL PLUGIN
      storage/archive/Makefile.am:
        WL#3201
          setup as plugin makefile
      storage/archive/ha_archive.cc:
        WL#3201
          Convert into a plugin
      storage/archive/ha_archive.h:
        WL#3201
          azlib.h now in local dir
      storage/blackhole/ha_blackhole.cc:
        WL#3201
          convert into a plugin
      storage/csv/Makefile.am:
        WL#3201
          setup as plugin makefile
      storage/csv/ha_tina.cc:
        WL#3201
          remove conditional compilation on MYSQL_PLUGIN
          mysql_declare_plugin macro change
      storage/example/Makefile.am:
        WL#3201
          fix as new-style plugin makefile
      storage/example/ha_example.cc:
        WL#3201
          remove conditional compilation on MYSQL_PLUGIN
          mysql_declare_plugin macro change
      storage/innobase/Makefile.am:
        WL#3201
          Lets make life easier and reduce innodb into a single library file
      config/ac-macros/plugins.m4:
        New BitKeeper file ``config/ac-macros/plugins.m4''
      sql/sql_builtin.cc.in:
        New BitKeeper file ``sql/sql_builtin.cc.in''
      storage/blackhole/Makefile.am:
        New BitKeeper file ``storage/blackhole/Makefile.am''
      83583111
  3. 11 Apr, 2006 35 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 087cae1a
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      087cae1a
    • unknown's avatar
      Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · a3fb0021
      unknown authored
      into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
      
      
      a3fb0021
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.1-17139 · 16002370
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      sql/sql_parse.cc:
        Auto merged
      16002370
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0d310faa
      unknown authored
      into  linux.site:/home/marty/MySQL/mysql-5.1-new
      
      
      sql/ha_partition.cc:
        Auto merged
      0d310faa
    • unknown's avatar
      Removed test case erroneously merged from 5.0 · 39bf253c
      unknown authored
      39bf253c
    • unknown's avatar
      Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · ee5e3314
      unknown authored
      into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
      
      
      ee5e3314
    • unknown's avatar
      Merge mysql.com:/home/alexi/bugs/mysql-5.0-13683 · 5d224206
      unknown authored
      into  mysql.com:/home/alexi/bugs/mysql-5.1-13683
      
      
      mysql-test/r/insert.result:
        Null-merge
      sql/sql_insert.cc:
        Null-merge
      5d224206
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3649074e
      unknown authored
      into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
      
      
      mysql-test/r/partition.result:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      3649074e
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0b5fe0f8
      unknown authored
      into  linux.site:/home/marty/MySQL/mysql-5.1-new
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      0b5fe0f8
    • unknown's avatar
      70798060
    • unknown's avatar
      Fixes for fast alter table for ndbcluster · 6b7e19af
      unknown authored
      6b7e19af
    • unknown's avatar
      Remove the my_seek calls as we have just opened the file for append with... · 718d66e6
      unknown authored
      Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already.
      
      
      storage/csv/ha_tina.cc:
        Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already
      718d66e6
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-5.1 · c73df225
      unknown authored
      into  shellback.:C:/mysql/my51-bug17368
      
      
      sql/ha_partition.cc:
        Auto merged
      c73df225
    • unknown's avatar
      Remove unused variable · ea28e412
      unknown authored
      ea28e412
    • unknown's avatar
      Close share->data_file in before renaming in ha_tina::repair · 79a2debe
      unknown authored
      Open and seek to end of data_file after rename 
      Fix comment for when file does not need repair.
      Set share->mapped_file to NULL always when it's been unmapped 
      Add test to see that file can be used after repair
      
      
      mysql-test/r/csv.result:
        Add more test to see that the table can be used after repair
      mysql-test/t/csv.test:
        Add more test to see that the table can be used after repair
      storage/csv/ha_tina.cc:
        Close share->data_file in before renaming in ha_tina::repair
        Open and seek to end after rename
        Fix comment for when file does not need repair.
        Set share->mapped_file to NULL always when it's been unmapped
      79a2debe
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 08dd4932
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      08dd4932
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7fc5eaad
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1-new
      
      
      7fc5eaad
    • unknown's avatar
      Bug#16233: XML: ExtractValue() fails with special characters · 6c0cfad1
      unknown authored
      ExtractValue didn't understand tag and attribute names
      consisting of "tricky" national letters (e.g. latin accenter letters).
      It happened because XPath lex parser recognized only basic
      latin letter a..z ad a part of an identifier.
      
      Fixed to recognize all letters by means of new "full ctype" which
      was added recently.
      
      
      mysql-test/r/xml.result:
        Adding test case
      mysql-test/t/xml.test:
        Adding test case
      sql/item_xmlfunc.cc:
        Using recently implemented "true" ctype functionality
            to treat all national letters as valid tag names,
            Only basic latin letters worked so far.
      strings/ctype-simple.c:
        A bug fix: ctype is array of 257 elements,
            adding offset to address correct element.
      6c0cfad1
    • unknown's avatar
      Remove extra "," · c8f24984
      unknown authored
      c8f24984
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 7b7cabcb
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      client/mysqltest.c:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      7b7cabcb
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 3307de72
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      3307de72
    • unknown's avatar
      Add surrounding braces, move invalidate dictionary_cace to after declaration... · 3b1a0c87
      unknown authored
      Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list"
      
      
      
      3b1a0c87
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · bb90de39
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      bb90de39
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 3c392808
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      3c392808
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 050100df
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/r/type_bit_innodb.result:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/key.cc:
        Auto merged
      sql/field.cc:
        Resolve merge conflict
      050100df
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0957814d
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.1
      
      
      0957814d
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · aacf8e3a
      unknown authored
      into  zim.(none):/home/brian/mysql/dep-5.1
      
      
      aacf8e3a
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b9dfe986
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      b9dfe986
    • unknown's avatar
      Drop a number of OS2 specific files. · 7c1d1276
      unknown authored
      
      BitKeeper/deleted/.del-BldLevel.cmd~d1a41ef0712190e1:
        Delete: os2/BldLevel.cmd
      BitKeeper/deleted/.del-BldLevelInf.cmd~49e29c82b3527c4a:
        Delete: os2/BldLevelInf.cmd
      BitKeeper/deleted/.del-BldLevel.RES~6701a23a4d0b0f33:
        Delete: os2/BldLevel.RES
      BitKeeper/deleted/.del-BldLevel.rc~fdab305a1b550012:
        Delete: os2/BldLevel.rc
      BitKeeper/deleted/.del-ChangeLog.os2~c473e6f17539eb4:
        Delete: os2/ChangeLog.os2
      BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713:
        Delete: os2/Makefile.am
      BitKeeper/deleted/.del-build-all.cmd~68479264bb9abe:
        Delete: os2/build-all.cmd
      BitKeeper/deleted/.del-MySQL-Client.icc~1d41cb9ed34c28ce:
        Delete: os2/MySQL-Client.icc
      BitKeeper/deleted/.del-mysql-inf.wis~fce577336b6bb0e:
        Delete: os2/mysql-inf.wis
      BitKeeper/deleted/.del-mysqlalt.wis~409d76f4dfd1e4c4:
        Delete: os2/mysqlalt.wis
      BitKeeper/deleted/.del-MySQL-Opt.icc~b9517e18e6cf6c05:
        Delete: os2/MySQL-Opt.icc
      BitKeeper/deleted/.del-MySQL-Source.icc~edded3c3a5cf83b1:
        Delete: os2/MySQL-Source.icc
      BitKeeper/deleted/.del-MySQL-Sql.icc~2ec2a87f4a096d31:
        Delete: os2/MySQL-Sql.icc
      BitKeeper/deleted/.del-MySQL-Sql.irs~266e93e2c9003567:
        Delete: os2/MySQL-Sql.irs
      BitKeeper/deleted/.del-MySQL-Util.icc~e6288097ceb9cbd2:
        Delete: os2/MySQL-Util.icc
      BitKeeper/deleted/.del-MySQL-Util.irs~cc5eb078dbc0605c:
        Delete: os2/MySQL-Util.irs
      BitKeeper/deleted/.del-mysql.wis~95ebdebeb470c823:
        Delete: os2/mysql.wis
      BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1:
        Delete: os2/ReadMe.txt
      BitKeeper/deleted/.del-rint.cmd~49a7df1e6a4214af:
        Delete: os2/rint.cmd
      BitKeeper/deleted/.del-rint.obj~e6bbb137ffb2f3d1:
        Delete: os2/rint.obj
      BitKeeper/deleted/.del-rint.s~82358ca146718a12:
        Delete: os2/rint.s
      BitKeeper/deleted/.del-config.h~1e58e9b6b3735392:
        Delete: os2/include/config.h
      BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f:
        Delete: os2/include/Makefile.am
      BitKeeper/deleted/.del-pwd.h~b26f27954da3a1be:
        Delete: os2/include/pwd.h
      BitKeeper/deleted/.del-sgtty.h~4321c310847cb55c:
        Delete: os2/include/sgtty.h
      BitKeeper/deleted/.del-termio.h~b136a899c396cb69:
        Delete: os2/include/termio.h
      BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c:
        Delete: os2/include/sys/Makefile.am
      BitKeeper/deleted/.del-file.h~90a5c4f6c7dfb5a:
        Delete: os2/include/sys/file.h
      BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b:
        Delete: include/config-os2.h
      BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5:
        Delete: mysys/my_os2cond.c
      BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a:
        Delete: mysys/my_os2dirsrch.c
      BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0:
        Delete: mysys/my_os2dirsrch.h
      BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd:
        Delete: mysys/my_os2dlfcn.c
      BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87:
        Delete: mysys/my_os2dlfcn.h0
      BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b:
        Delete: mysys/my_os2file64.c
      BitKeeper/deleted/.del-my_os2mutex.c~79f7438bfde5132a:
        Delete: mysys/my_os2mutex.c
      BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a:
        Delete: mysys/my_os2thread.c
      BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea:
        Delete: mysys/my_os2tls.c
      Makefile.am:
        Removed os2 reference
      configure.in:
        Removed OS2 specific os2 files.
      include/Makefile.am:
        Removed os2 specific config file.
      include/my_global.h:
        Removed OS2 specific files.
      mysys/Makefile.am:
        Removed OS2 specific files.
      7c1d1276
    • unknown's avatar
      mysql_upgrade.c: · 2cf4bf8c
      unknown authored
        No declarations after first expression in block
      
      
      client/mysql_upgrade.c:
        No declarations after first expression in block
      2cf4bf8c
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 814f7668
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      814f7668
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 · 69e54f84
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      69e54f84
    • unknown's avatar
      Merge · c2feb214
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/log.cc:
        Auto merged
      c2feb214
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 099e770e
      unknown authored
      into  big_geek.:C:/Work/mysql/mysql-5.1-test
      
      
      099e770e
    • unknown's avatar
      manual merge · 94c32876
      unknown authored
      94c32876
  4. 10 Apr, 2006 3 commits