1. 18 Aug, 2006 6 commits
    • unknown's avatar
      17926 duplicates Bug#1989 in bug db · f177075e
      unknown authored
      on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
      in 5.1 tree. backing 17926 out of 5.1 tree.
      
      
      client/mysql.cc:
        Bug#17926 duplicates Bug#1989 in bug db
        
        back 17926 out of 5.1 tree
      f177075e
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 306cf494
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
      
      
      306cf494
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-maint · ae606850
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
      
      
      sql/ha_innodb.cc:
        null
      storage/innobase/btr/btr0btr.c:
        null
      storage/innobase/buf/buf0buf.c:
        null
      storage/innobase/dict/dict0dict.c:
        null
      storage/innobase/fil/fil0fil.c:
        null
      storage/innobase/fsp/fsp0fsp.c:
        null
      storage/innobase/include/btr0cur.ic:
        null
      storage/innobase/include/buf0buf.ic:
        null
      storage/innobase/log/log0log.c:
        null
      storage/innobase/log/log0recv.c:
        null
      storage/innobase/os/os0file.c:
        null
      storage/innobase/row/row0mysql.c:
        null
      storage/innobase/row/row0sel.c:
        null
      storage/innobase/srv/srv0start.c:
        null
      storage/innobase/ut/ut0dbg.c:
        null
      ae606850
    • unknown's avatar
      innodb r702 · 3468780e
      unknown authored
      innodb r719
      
      
      innobase/btr/btr0btr.c:
        innodb r702
      innobase/buf/buf0buf.c:
        innodb r702
      innobase/dict/dict0dict.c:
        innodb r702
      innobase/fil/fil0fil.c:
        innodb r702
      innobase/fsp/fsp0fsp.c:
        innodb r702
      innobase/include/btr0cur.ic:
        innodb r719
      innobase/include/buf0buf.ic:
        innodb r702
      innobase/log/log0log.c:
        innodb r702
      innobase/log/log0recv.c:
        innodb r702
      innobase/os/os0file.c:
        innodb r702
      innobase/row/row0mysql.c:
        innodb r702
      innobase/row/row0sel.c:
        innodb r702
      innobase/srv/srv0start.c:
        innodb r702
      innobase/ut/ut0dbg.c:
        innodb r702
      sql/ha_innodb.cc:
        innodb r702
      3468780e
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 05d061d3
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
      
      
      05d061d3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · c35d9181
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      c35d9181
  2. 17 Aug, 2006 16 commits
    • unknown's avatar
      A couple of adjustments to the merge to fix the broken build · 55fb3cae
      unknown authored
      instance.cc:
        Removed wrongly placed closing brace
      item_geofunc.cc:
        needed to pass in a TABLE_SHARE* instead of a TABLE*
      
      
      server-tools/instance-manager/instance.cc:
        Removed wrongly placed closing brace
      sql/item_geofunc.cc:
        needed to pass in a TABLE_SHARE* instead of a TABLE*
      55fb3cae
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 9954f424
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
      
      
      9954f424
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 8a63b700
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      8a63b700
    • unknown's avatar
      rename to avoid case sensitive collision · 703717c7
      unknown authored
      
      BitKeeper/deleted/.del-readme-renamed:
        Rename: BitKeeper/deleted/.del-readme -> BitKeeper/deleted/.del-readme-renamed
      703717c7
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 548d45a2
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/disabled.def:
        SCCS merged
      548d45a2
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · b8930cbc
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/grant.result:
        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/mysql-test-run.pl:
        Manual merge
      mysql-test/t/func_time.test:
        Manual merge
      b8930cbc
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/tmp_reg · b32b2ce7
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/r/information_schema_db.result:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/r/type_ranges.result:
        Auto merged
      mysql-test/r/type_timestamp.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      mysql-test/t/type_timestamp.test:
        Auto merged
      server-tools/instance-manager/messages.cc:
        Auto merged
      sql/item_geofunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      b32b2ce7
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 5c8c2ab4
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      BitKeeper/deleted/.del-mysql_client.result:
        Auto merged
      BitKeeper/deleted/.del-mysql_client.test:
        Auto merged
      client/mysql.cc:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      5c8c2ab4
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 860c3853
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      860c3853
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 7faa9efe
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      7faa9efe
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · d82c1514
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      d82c1514
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · d3efda57
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      d3efda57
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · c7815f2a
      unknown authored
      into  maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
      
      
      c7815f2a
    • unknown's avatar
    • unknown's avatar
      merge warning test results (!) · 0073d9be
      unknown authored
      0073d9be
    • unknown's avatar
      test result changes (non-functional) for 5.1-5.0 merge · 2eb9eb9f
      unknown authored
      
      mysql-test/r/federated_transactions.result:
        merge fixes to result file (case sensitivity)
      mysql-test/r/warnings.result:
        wrong warning message result
      2eb9eb9f
  3. 16 Aug, 2006 18 commits