1. 28 Aug, 2006 2 commits
  2. 25 Aug, 2006 5 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 · 78849677
      unknown authored
      into  zim.(none):/home/brian/mysql/arch-5.1
      
      
      BUILD/compile-alpha-cxx:
        Auto merged
      BUILD/compile-alpha-debug:
        Auto merged
      BUILD/compile-dist:
        Auto merged
      BUILD/compile-ia64-debug-max:
        Auto merged
      CMakeLists.txt:
        Auto merged
      client/mysql.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      BUILD/FINISH.sh:
        Innodbase config still needed.
      78849677
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 3c68ccd7
      unknown authored
      into  zim.(none):/home/brian/mysql/arch-5.1
      
      
      sql/handler.cc:
        Auto merged
      3c68ccd7
    • unknown's avatar
      Cleanup of unused variables. · e3416053
      unknown authored
      Fixed "discover" in the handler API.
      
      Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread. 
      
      
      sql/ha_innodb.h:
        Unused variable
      sql/ha_ndbcluster.cc:
        Added "discover" to handlerton.
      sql/handler.cc:
        Added plugin loop and correctly now use handler API.
      sql/handler.h:
        Removed unused variable. Added discover to handler API
      sql/mysqld.cc:
        Removed unused variables.
      sql/sql_plugin.cc:
        Fixed DBUG Enter comment (obvious cut paste mistake)
      storage/csv/ha_tina.cc:
        Found that if we don't bzero handlerton, that things can go boom!
        
        This probably needs to be fixed for all handlers
      e3416053
    • unknown's avatar
      63232b66
    • unknown's avatar
      fix for windows build · a56152a5
      unknown authored
      
      CMakeLists.txt:
        add for federated
      libmysqld/CMakeLists.txt:
        ha_heap.cc and ha_myisam.cc are removed
        add for federated
      sql/CMakeLists.txt:
        add for federated
      sql/handler.cc:
        fix for fussy compilers
      storage/heap/CMakeLists.txt:
        add ha_heap.cc
      storage/myisammrg/CMakeLists.txt:
        add ha_myisammrg.cc
      a56152a5
  3. 24 Aug, 2006 25 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ce35a008
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
      
      
      mysql-test/r/csv.result:
        SCCS merged
      mysql-test/t/csv.test:
        SCCS merged
      storage/csv/ha_tina.cc:
        Using petr's merge.
      sql/sql_acl.cc:
        SCCS merged
      sql/sql_show.cc:
        SCCS merged
      ce35a008
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 01e0f41a
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      01e0f41a
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972 · 6cb4ab66
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972
      
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysql.cc:
        Auto merged
      client/mysql_upgrade.c:
        Auto merged
      include/config-netware.h:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/gen_lex_hash.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/csv.result:
        manual merge
      mysql-test/t/csv.test:
        manual merge
      storage/csv/ha_tina.cc:
        manual merge
      6cb4ab66
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 · e746a18a
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
      
      
      BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/mysql_client_test.test:
        Auto merged
      server-tools/instance-manager/listener.cc:
        Auto merged
      server-tools/instance-manager/portability.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      client/mysql.cc:
        manual merge
      mysql-test/r/grant.result:
        manual merge
      e746a18a
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint · ed3c97f4
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
      
      ed3c97f4
    • unknown's avatar
      Bug #11972: client uses wrong character set after reconnect. · c6910b9b
      unknown authored
      The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
      
      
      client/mysql.cc:
        Client charset command now changes the default character set and issues a SET NAMES command to the server.
      mysql-test/r/mysql.result:
        Corrected results for new behaviour.
      mysql-test/t/mysql.test:
        Removed redundant commands from test.
      c6910b9b
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749 · 24771e36
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      24771e36
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 1ba734ad
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      1ba734ad
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 82497df8
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
      
      82497df8
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194 · 8ed76c11
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
      
      
      support-files/mysql.spec.sh:
        Auto merged
      8ed76c11
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20841 · 6ae70102
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      mysql-test/r/ndb_dd_backuprestore.result:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      6ae70102
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 · 6652cef9
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
      
      
      support-files/mysql.spec.sh:
        Auto merged
      6652cef9
    • unknown's avatar
      Bug#20841 mysqldump fails to store right info with --compatible=mysql40 option · 013f4f8a
      unknown authored
       - Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
       
      
      
      mysql-test/r/ndb_dd_advance.result:
        Update result file
      mysql-test/r/ndb_dd_advance2.result:
        Update result file
      mysql-test/r/ndb_dd_backuprestore.result:
        Update result file
      mysql-test/r/ndb_dd_basic.result:
        Update result file
      mysql-test/r/ndb_dd_disk2memory.result:
        Update result file
      sql/sql_show.cc:
        Add "not in version before"  comments around "WITH PARSER xxx" and "TABLESPACE xxx STORAGE DISK"
        Use STRING_WITH_LEN when adding fixed string AUTO_INCREMENT= to output from SHOW TABLE
      013f4f8a
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · c8a98610
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      c8a98610
    • unknown's avatar
      after merge fix · 31816b91
      unknown authored
      31816b91
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749 · cb8614e3
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      cb8614e3
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749 · b2ef8e86
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749
      
      
      dbug/dbug.c:
        Auto merged
      configure.in:
        SCCS merged
      b2ef8e86
    • unknown's avatar
      Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873 · c2d52b34
      unknown authored
      
      configure.in:
        Exclude
      dbug/dbug.c:
        Exclude
      c2d52b34
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c02e5f8c
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/51
      
      c02e5f8c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · cf9edf5a
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/50
      
      cf9edf5a
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/beef-51 · 649984c2
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/51
      
      
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      649984c2
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 · 2b8e91c6
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/50
      
      
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      2b8e91c6
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 · 8f3c665f
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/beef-51
      
      
      mysql-test/r/func_misc.result:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      8f3c665f
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41 · 59008245
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/beef-50
      
      
      mysql-test/r/func_misc.result:
        Manual merge
      mysql-test/t/func_misc.test:
        Manual merge
      sql/item_func.h:
        Manual merge
      sql/item_strfunc.cc:
        Manual merge
      59008245
    • unknown's avatar
      Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets · 399b9b35
      unknown authored
      - Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
      - Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
      
      
      mysql-test/r/func_misc.result:
        Test EXPORT_SET() with charset coersion (bug #21531)
      mysql-test/t/func_misc.test:
        Test EXPORT_SET() with charset coersion (bug #21531)
      sql/item_func.h:
        Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors.
      sql/item_strfunc.cc:
        Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail.
      399b9b35
  4. 23 Aug, 2006 8 commits