1. 28 Sep, 2006 4 commits
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1ec1fc44
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      1ec1fc44
    • unknown's avatar
      after merge fix · 1e641502
      unknown authored
      1e641502
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 5f10ffd0
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1
      
      
      include/mysql_com.h:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_repl.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/sp.cc:
        manual merge
      sql/sp_head.cc:
        manual merge
      sql/sql_class.h:
        manual merge
      sql/table.cc:
        manual merge
      5f10ffd0
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2d48a1f2
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
      
      
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/sp.result:
        manual merge
      mysql-test/t/sp.test:
        manual merge
      storage/csv/ha_tina.cc:
        manual merge
      storage/myisam/ha_myisam.cc:
        manual merge
      2d48a1f2
  2. 27 Sep, 2006 6 commits
  3. 26 Sep, 2006 4 commits
    • unknown's avatar
      Added more tests of field conversions. · 5529b7fb
      unknown authored
      5529b7fb
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-runtime · 4e5b560d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-runtime
      
      
      4e5b560d
    • unknown's avatar
      Fix for bug#20208 · 770e9b4b
      unknown authored
      A better fix for bug#10025.
      
      Fixed test case plus added new tests.
      
      After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
      the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
      became more accurate. Earlier mediumtext got converted to longtext,
      although mediumtext was enough to contain the results. Now it converts
      correctly to mediumtext, if the length does not exceed that and if none
      of the original fields were type longtext.
      
      Type longtext still converts correctly to type longtext, as the extra
      tests prove.
      
      
      mysql-test/r/union.result:
        Fixed an earlier test case plus added two new tests.
      mysql-test/t/union.test:
        Fixed an earlier test case plus added two new tests.
      770e9b4b
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · 3436f0ac
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      mysql-test/r/func_time.result:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/r/view.result:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      mysql-test/t/func_time.test:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      mysql-test/t/type_date.test:
        Auto merged
      mysql-test/t/view.test:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      sql/item_cmpfunc.cc:
        Null-merge, the change in the 5.0 general tree supersedes the 5.0.25 patch.
      3436f0ac
  4. 25 Sep, 2006 7 commits
    • unknown's avatar
      Fix for bug#22662 Inconsistent values displayed for event_scheduler · 070c8e74
      unknown authored
      when set to DISABLED
        
      It was a silly ordering number error.
      
      
      
      sql/events.h:
        fix ordinal number, the cause for bug #22662
        Inconsistent values displayed for event_scheduler when set to DISABLED
      mysql-test/r/events_restart_phase0.result:
        New BitKeeper file ``mysql-test/r/events_restart_phase0.result''
      mysql-test/t/events_restart_phase0.log:
        New BitKeeper file ``mysql-test/t/events_restart_phase0.log''
      mysql-test/t/events_restart_phase0.result:
        New BitKeeper file ``mysql-test/t/events_restart_phase0.result''
      070c8e74
    • unknown's avatar
      Fix for bug#22397 Events: crash with procedure which alters events · 6c9400b9
      unknown authored
        
      ALTER EVENT in stored procedure body led to a crash during the
      procedure call. Affected was only ALTER EVENT which changed the
      interval of the event. No problems with AT, STARTS, ENDS and so on.
      
      
      
      mysql-test/r/events_bugs.result:
        fix result
      mysql-test/t/events_bugs.test:
        add test case for bug 22397 : Events, crash with procedure which alters body
      sql/event_data_objects.cc:
        fix copy&paste error in code, which resulted in bug#22397
        Events: crash with procedure which alters body
      6c9400b9
    • unknown's avatar
      cleanups - fix a test and remove unneeded declaration · 038fbc27
      unknown authored
      
      mysql-test/r/events.result:
        test result
      mysql-test/t/events.test:
        fix test
      sql/sql_show.cc:
        remove unneeded declaration
      038fbc27
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime · cd6a5b87
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime
      
      
      server-tools/instance-manager/guardian.cc:
        Auto merged
      server-tools/instance-manager/instance.cc:
        Auto merged
      server-tools/instance-manager/instance_options.cc:
        Auto merged
      cd6a5b87
    • unknown's avatar
      207fd3fa
    • unknown's avatar
      Bug #22379 im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-engines · f91b91cf
      unknown authored
      Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
      pidfile, secondly it should be removed by the process that created it and _only_ if it's
      certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
      - Set state of an instance to STARTING _before_ calling instance->start()
      - Check that pidfile of instance has been created before changing STARTING => STARTED
      - Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself
      
      
      server-tools/instance-manager/guardian.cc:
        If state of an instance is STARTING, chech that the instance pidfile has been created
        before changing state to STARTED
        Set state to STARTING before calling instance->start(), it can take some time
        before it is fully started and during that time it should be in state STARTING
      server-tools/instance-manager/instance.cc:
        Only remove the pid file of instance manager when a SIGKILL has 
        been performed sucessfully
      server-tools/instance-manager/instance_options.cc:
        Check that fscanf returns 1 which is the number of args that should be scanned from
        the pid file
      f91b91cf
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · af3f646c
      unknown authored
      into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
      
      
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      include/mysql_com.h:
        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
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      af3f646c
  5. 24 Sep, 2006 4 commits
  6. 23 Sep, 2006 14 commits
    • unknown's avatar
      mysql.spec.sh: · 52684501
      unknown authored
        Added "test" RPM package
        Install all binaries "make install" would
      make_binary_distribution.sh:
        Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
      
      
      scripts/make_binary_distribution.sh:
        Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
      support-files/mysql.spec.sh:
        Removed the rest of the "bench" sub RPM, but added a new "test" sub
        RPM containing the "mysql-test" directory earlier in the "bench" sub
        RPM. The new sub RPM "Obsoltes" "mysql-bench" as well.
        
        Added the rest of the binaries that "make install" would install
        
          bin/ndb_print_backup_file
          bin/ndb_print_schema_file
          bin/ndb_print_sys_file
          sbin/ndb_cpcd
      52684501
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 · ff27c085
      unknown authored
      into  zim.(none):/home/brian/mysql/merge-5.1
      
      
      sql/mysql_priv.h:
        Auto merged
      ff27c085
    • unknown's avatar
      Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1 · a5d82874
      unknown authored
      into  mysql.com:/users/lthalmann/bkroot/mysql-5.1
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      mysql-test/t/ndb_multi.test:
        Manual merge
      a5d82874
    • unknown's avatar
      Merge zim.(none):/home/brian/mysql/merge-5.1 · cdf0bfbc
      unknown authored
      into  zim.(none):/home/brian/mysql/arch-5.1
      
      
      cdf0bfbc
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 · 39511a56
      unknown authored
      into  zim.(none):/home/brian/mysql/merge-5.1
      
      
      sql/mysql_priv.h:
        Auto merged
      39511a56
    • unknown's avatar
      Required file for next tests (taken from work by JimW in Falcon) · 459102b6
      unknown authored
      
      mysql-test/r/true.require:
        New BitKeeper file ``mysql-test/r/true.require''
      459102b6
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · d339895f
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~3:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/udf_example.c:
        Auto merged
      BitKeeper/deleted/.del-udf_example.def:
        Delete: sql/udf_example.def
      mysql-test/mysql-test-run.pl:
        Manual merge 5.0->5.1
      sql/Makefile.am:
        Manual merge 5.0->5.1
      d339895f
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · f3172a89
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      f3172a89
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 97c3a273
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      97c3a273
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 1e84e31c
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      1e84e31c
    • unknown's avatar
      Disabling test case · 3bd90044
      unknown authored
      3bd90044
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 7671fbc2
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/t/disabled.def:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      7671fbc2
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 2bfeecca
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      2bfeecca
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 14ad51e0
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      14ad51e0
  7. 22 Sep, 2006 1 commit
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb · 56c7e8b3
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      56c7e8b3