1. 23 Aug, 2006 1 commit
    • unknown's avatar
      Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions · 0baa801e
      unknown authored
      setup 'share' struct for all partiton file elements. It's neccessary because we use
      m_file[0]->update_create_info(create_info) during ha_partition::update_create_info
      and 'share' for m_file[0] should be valid
      
      
      sql/ha_partition.h:
        Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
      sql/handler.h:
        Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
      0baa801e
  2. 22 Aug, 2006 1 commit
  3. 21 Aug, 2006 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 1b6858ea
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      1b6858ea
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · bfaef559
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      bfaef559
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · 167aaaa5
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      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
      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
      BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
        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.
      167aaaa5
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · a6113078
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      mysql-test/r/func_time.result:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      mysql-test/t/func_time.test:
        Manual merge.
      a6113078
    • unknown's avatar
      mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries, · 524914b2
      unknown authored
      because searching for them makes the script abort with all non-NDB builds.
      
      
      mysql-test/mysql-test-run.pl:
        Checking with "mtr_exe_exists()" for the location of a binary will yield an error
        if the binary is found nowhere at all, and this happens with NDB binaries in all
        builds that do not contain NDB;  so the correct way is fixed path names only.
        Still part of the fix for the #21721 bug.
      524914b2
    • unknown's avatar
      Many files: · 2d766479
      unknown authored
        Deleted config/ac-macros/ha_berkeley.m4
        Removed more referenses to bdb
      
      
      BitKeeper/deleted/.del-ha_berkeley.m4:
        Delete: config/ac-macros/ha_berkeley.m4
      BUILD/FINISH.sh:
        Removed more referenses to bdb
      BUILD/compile-alpha-cxx:
        Removed more referenses to bdb
      BUILD/compile-alpha-debug:
        Removed more referenses to bdb
      BUILD/compile-dist:
        Removed more referenses to bdb
      BUILD/compile-ia64-debug-max:
        Removed more referenses to bdb
      CMakeLists.txt:
        Removed more referenses to bdb
      Makefile.am:
        Removed more referenses to bdb
      libmysqld/lib_sql.cc:
        Removed more referenses to bdb
      sql/mysql_priv.h:
        Removed more referenses to bdb
      storage/ndb/config/win-prg.am:
        Removed more referenses to bdb
      storage/ndb/test/run-test/ndb-autotest.sh:
        Removed more referenses to bdb
      support-files/my-huge.cnf.sh:
        Removed more referenses to bdb
      support-files/my-large.cnf.sh:
        Removed more referenses to bdb
      support-files/my-medium.cnf.sh:
        Removed more referenses to bdb
      2d766479
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c75d6dbd
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      c75d6dbd
  4. 20 Aug, 2006 1 commit
  5. 18 Aug, 2006 3 commits
  6. 17 Aug, 2006 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · eda1afe2
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      eda1afe2
    • 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
      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 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 bk-internal.mysql.com:/data0/bk/mysql-5.1 · 62af392e
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      mysql-test/r/view.result:
        Auto merged
      62af392e
    • 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
  7. 16 Aug, 2006 15 commits
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · b2cfa703
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/r/mysql_client.result:
        manual merge
      mysql-test/t/func_time.test:
        manual merge
      mysql-test/t/mysql_client.test:
        manual merge
      sql/sql_acl.cc:
        manual merge
      b2cfa703
    • unknown's avatar
      manual merge · 1c28a068
      unknown authored
      1c28a068
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · 46f25b3b
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      BitKeeper/deleted/.del-mysql_client.result:
        manual merge
      BitKeeper/deleted/.del-mysql_client.test:
        manual merge
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/t/func_time.test:
        manual merge
      sql/sql_acl.cc:
        manual merge
      46f25b3b
    • unknown's avatar
      Bug#20328 - Correction to test/result for broken Windows build. · 49342315
      unknown authored
      
      mysql-test/r/mysql_client.result:
        Removed OS dependant output.
      mysql-test/t/mysql_client.test:
        Re-directed output to a temporary file because the actual output isn't important and was causing a Windows test failure.
      49342315
    • unknown's avatar
      8ef847ea
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5a7ab737
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
      
      
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/ctype_cp1250_ch.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/ctype_cp1250_ch.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      storage/myisam/mi_unique.c:
        Auto merged
      5a7ab737
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 035137fe
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
      
      
      mysql-test/r/warnings.result:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      sql/share/errmsg.txt:
        SCCS merged
      035137fe
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 90b069ed
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      90b069ed
    • unknown's avatar
      small fix to enable the test suite to find executables and scripts on Windows · 75598ef8
      unknown authored
      
      mysql-test/lib/mtr_misc.pl:
        if running on win32, check for the existence of the file rather than it being executable
      75598ef8
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 · 49c308f6
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      49c308f6
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt · a8d8ebed
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-kt
      
      
      a8d8ebed
    • unknown's avatar
      Bug#20871 Partitions: crash if --skip-innodb · ddaef30b
      unknown authored
      return error if engine is disabled
      
      
      ddaef30b
    • unknown's avatar
      Bug#20328 mysql client: dumb about trailing spaces on 'help' command · a707d490
      unknown authored
       Fix testcase to also work on windows
      
      
      BitKeeper/deleted/.del-mysql_client.test:
        Delete: mysql-test/t/mysql_client.test
      BitKeeper/deleted/.del-mysql_client.result:
        Delete: mysql-test/r/mysql_client.result
      mysql-test/r/mysql.result:
        Update test result
      mysql-test/t/mysql.test:
        Move tests from mysql_client to mysql
        Fix test case for bug#20328 to work on windows by comparing the output from "help" and "help "
      a707d490
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 2d283fad
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      2d283fad
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · d03b17b9
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      d03b17b9