1. 31 Oct, 2007 1 commit
    • unknown's avatar
      Sundry changes to fix merge problems. Most of these are duplicated · db2f84af
      unknown authored
      in 5.0-community, but pulling to merge was very hard.
      
      
      sql/mysql_priv.h:
        Add new extern "C" qualification to set_thd_proc_info().
        
        Fix typo in merge.
      sql/mysqld.cc:
        Replace obselete gptr with uchar* .
        
        Add missing #endif from merge problem.
      sql/set_var.cc:
        Include new parameter to user variable contruction.
      sql/sql_cache.cc:
        Remove duplicate line from merge problem.
      sql/sql_profile.cc:
        struct st_table_list is now typedef'd to a new name.
        
        ST_FIELD_INFO now includes a new member, a pointer to an open_table
        function.
      sql/sql_profile.h:
        struct st_table_list is now typedef'd to a new name.
      db2f84af
  2. 29 Oct, 2007 3 commits
    • unknown's avatar
      Remove easily-changed and prominent variable that toggled · 46f19945
      unknown authored
      community-server features.
      
      Community server features should be fully integrated into 5.1, but
      disabled by default.  We never toggle that they're disabled based
      on the version number, in the 5.1 line and later.
      
      
      configure.in:
        Remove easily-changed and prominent variable that toggled
        community-server features.
      46f19945
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge · e78a21ee
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
      
      
      client/mysqlcheck.c:
        Auto merged
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/func_in.test:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      sql/sql_lex.h:
        SCCS merged
      e78a21ee
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2a934d94
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      2a934d94
  3. 25 Oct, 2007 1 commit
    • unknown's avatar
      Mimic a rename which Daniel already did in 6.0, · 3e6acc9a
      unknown authored
      to get rid of a name clash among *deleted* files on case-insignificant file systems.
      
      
      BitKeeper/deleted/.del-changelog-bleh:
        Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh
      3e6acc9a
  4. 24 Oct, 2007 1 commit
  5. 23 Oct, 2007 34 commits
    • unknown's avatar
      result fix · a3d3fa35
      unknown authored
      a3d3fa35
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 2446b969
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        after merge fix
      2446b969
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · cb178356
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      cb178356
    • unknown's avatar
      after merge fix · e3eed377
      unknown authored
      e3eed377
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · a895c8f0
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/client_priv.h:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/query_cache.result:
        manual merge
      mysql-test/include/mix1.inc:
        manual merge
      mysql-test/r/innodb_mysql.result:
        manual merge
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/query_cache.test:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      a895c8f0
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 3e459feb
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      3e459feb
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 63230037
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      63230037
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4eaaddec
      unknown authored
      into  mysql.com:/home/hf/work/30638/my50-30638
      
      4eaaddec
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 4cc7db9d
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      4cc7db9d
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · a540bfee
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      sql/opt_range.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      a540bfee
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 1cdb1777
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      1cdb1777
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · 1d3ab6fe
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      1d3ab6fe
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2e2f6ea7
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      2e2f6ea7
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 00637970
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      00637970
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · cc7c8e93
      unknown authored
      into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
      
      
      sql/filesort.cc:
        SCCS merged
      cc7c8e93
    • unknown's avatar
      type conversions fixed to get rid of warnings · d61d1880
      unknown authored
      
      sql/ha_heap.cc:
        type conversion fix
      sql/opt_range.cc:
        type conversion fix
      d61d1880
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · a4c0c6f4
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      a4c0c6f4
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · a8cd7af9
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      a8cd7af9
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 5c7c4141
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
      
      5c7c4141
    • unknown's avatar
      merge 5.0-opt -> 5.1-opt for bug 30825 · 3579cdfc
      unknown authored
      3579cdfc
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · fd721c36
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      fd721c36
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · f3c632dd
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      sql/opt_range.cc:
        merging
      f3c632dd
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 97d42ff3
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
      
      97d42ff3
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3fbb2511
      unknown authored
      into  mysql.com:/home/hf/work/30638/my50-30638
      
      3fbb2511
    • unknown's avatar
      type conversion fixed to get rid of warnings · 72de8440
      unknown authored
      
      sql/opt_range.cc:
        type conversion fixed
      72de8440
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 698c0ac4
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      698c0ac4
    • unknown's avatar
      merging · 63a90767
      unknown authored
      63a90767
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ed3117c5
      unknown authored
      into  mysql.com:/home/hf/work/30638/my50-30638
      
      ed3117c5
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 894def5a
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      894def5a
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · cbe55306
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/mi_write.c:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      sql/opt_range.cc:
        merging
      sql/sql_map.cc:
        merging
      storage/federated/ha_federated.cc:
        merging
      storage/heap/ha_heap.cc:
        merging
      cbe55306
    • unknown's avatar
      type conversions fixed to avoid warnings on Windows · c44daa8e
      unknown authored
      
      myisam/mi_write.c:
        type conversion fixed
      myisam/sort.c:
        type conversion fixed
      sql/ha_federated.cc:
        type conversion fixed
      sql/ha_heap.cc:
        type conversion fixed
      sql/ha_innodb.cc:
        type conversion fixed
      sql/ha_myisam.cc:
        type conversion fixed
      sql/opt_range.cc:
        type conversion fixed
      sql/sql_map.cc:
        type conversion fixed
      sql/sql_select.cc:
        type conversion fixed
      sql/sql_update.cc:
        type conversion fixed
      c44daa8e
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 5e0f8015
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
      
      5e0f8015
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt · f3b35fbf
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
      
      
      mysql-test/r/gis-rtree.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      BitKeeper/deleted/.del-bdb_gis.result:
        Auto merged
      BitKeeper/deleted/.del-bdb_gis.test:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/innodb_gis.result:
        merged 5.0-opt -> 5.1-opt
      mysql-test/t/innodb_gis.test:
        merged 5.0-opt -> 5.1-opt
      sql/field.cc:
        merged 5.0-opt -> 5.1-opt
      sql/field.h:
        merged 5.0-opt -> 5.1-opt
      sql/sql_select.h:
        merged 5.0-opt -> 5.1-opt
      sql/sql_yacc.yy:
        merged 5.0-opt -> 5.1-opt
      sql/table.cc:
        merged 5.0-opt -> 5.1-opt
      f3b35fbf
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 241ede38
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      
      sql/field.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      241ede38