1. 30 Nov, 2006 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 85b49578
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      85b49578
    • unknown's avatar
      Bug #24487 Valgrind: uninited byte in table->record[1] in binlog code for rbr + inno db · e11d8d5a
      unknown authored
      The reason of this valgrind's compaint is not a bug but rather a feature of bitwise ops:
      for any value of the byte x
      x | 1 -> 1,  and x & 0 -> 0.
      x, being a null_byte part of record[1] can be left unassigned even after
      ha_innobase::index_read_idx because the above and still be correct.
      Addding a check memory upon the invocation of the function can detect this fact
      long before record[1], old record, is eventually passed to my_write.
      
      Fixed with initialization of record[1]'s null_bytes part in open_table_from_share.
      
      
      sql/table.cc:
        initialization of null-bytes for valgrind.
      e11d8d5a
    • unknown's avatar
      Fix for the following bugs: · 507e9f56
      unknown authored
        - BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
          Failed and Abandoned;
        - BUG#23476: DROP INSTANCE does not work
        - BUG#23215: STOP INSTANCE takes too much time
      
      BUG#22306:
      The problem was that STOP INSTANCE checked that mysqld is up and running.
      If it was not so, STOP INSTANCE reported an error. Now, STOP INSTANCE
      reports an error if the instance has been started (mysqld can be down).
      
      BUG#23476:
      The problem was that DROP INSTANCE tried to stop inactive instance. The fix is
      trivial.
      
      BUG#23215:
      The problem was that locks were not acquired properly, so the
      instance-monitoring thread could not acquire the mutex, holded by the
      query-processing thread.
      
      The fix is to simplify locking scheme by moving instance-related information to
      Instance-class out of Guardian-class. This allows to get rid of storing a
      separate list of Instance-information in Guardian and keeping it synchronized
      with the original list in Instance_map.
      
      
      server-tools/instance-manager/commands.cc:
        1. Introduce Instance_cmd class -- base class for the commands
           that deal with the one instance;
        2. Remove Instance_map argument from command constructors;
        3. Ensure, that Instance Map and Instance are locked in the proper order;
        4. Polishing.
      server-tools/instance-manager/commands.h:
        1. Introduce Instance_cmd class -- base class for the commands
           that deal with the one instance;
        2. Remove Instance_map argument from command constructors;
        3. Polishing.
      server-tools/instance-manager/guardian.cc:
        1. Move "extended" instance information to the Instance-class.
           That allows to get rid of storing instance-related container and data in
           Guardian class, that significantly simplifies locking schema.
        2. Polishing.
      server-tools/instance-manager/guardian.h:
        1. Move "extended" instance information to the Instance-class.
           That allows to get rid of storing instance-related container and data in
           Guardian class, that significantly simplifies locking schema.
        2. Polishing.
      server-tools/instance-manager/instance.cc:
        1. Move "extended" instance information to the Instance-class.
        2. Introduce new state STOPPED to mark that guarded instance
           is stopped and should not be restarted by Guardian.
        3. Polishing.
      server-tools/instance-manager/instance.h:
        1. Move "extended" instance information to the Instance-class.
        2. Introduce new state STOPPED to mark that guarded instance
           is stopped and should not be restarted by Guardian.
        3. Polishing.
      server-tools/instance-manager/instance_map.cc:
        1. Move flush_instances() from Instance_map to Manager.
        2. Polishing.
      server-tools/instance-manager/instance_map.h:
        1. Move flush_instances() from Instance_map to Manager.
        2. Polishing.
      server-tools/instance-manager/instance_options.h:
        Polishing.
      server-tools/instance-manager/manager.cc:
        1. Move flush_instances() from Instance_map to Manager.
        2. Polishing.
      server-tools/instance-manager/manager.h:
        1. Move flush_instances() from Instance_map to Manager.
        2. Polishing.
      server-tools/instance-manager/user_map.cc:
        Polishing.
      507e9f56
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f513b974
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      f513b974
    • unknown's avatar
      A post-merge fix: fix the failing trigger-grant.test. · 2002e4bc
      unknown authored
      
      sql/sql_trigger.cc:
        Another post-merge fix: make TRIGGER privilege work again, after
        IF EXISTS refactoring.
      2002e4bc
  2. 29 Nov, 2006 28 commits
    • unknown's avatar
      A post-merge fix. · c7c560f6
      unknown authored
      
      mysql-test/r/func_str.result:
        Update results (a post-merge fix).
      c7c560f6
    • unknown's avatar
      A post-merge fix. · 400b094c
      unknown authored
      400b094c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5c6fdb83
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/lib/mtr_io.pl:
        Auto merged
      mysql-test/r/im_daemon_life_cycle.result:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/r/rpl_trigger.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      mysql-test/t/im_utils.imtest:
        Auto merged
      mysql-test/t/rpl_trigger.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Use local.
      mysql-test/r/func_str.result:
        SCCS merged
      mysql-test/t/func_str.test:
        Manual merge.
      sql/sql_trigger.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      5c6fdb83
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 74cfb1ed
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      74cfb1ed
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 677294e5
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      677294e5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f1bb5185
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      f1bb5185
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f896d2b
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      5f896d2b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 1d31140e
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      1d31140e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 78ade29e
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      78ade29e
    • unknown's avatar
      Many files: · c41da42c
      unknown authored
        Changed paths to ndb include directory to include "storage"
      Makefile.am:
        Adjusted path to yaSSL libtool libraries
      ssl.m4:
        Use libtool way of specifying yaSSL libraries
      
      
      config/ac-macros/ssl.m4:
        Use libtool way of specifying yaSSL libraries
      libmysqld/Makefile.am:
        Adjusted path to yaSSL libtool libraries
      storage/ndb/config/type_kernel.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapi.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapitest.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapitools.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_util.mk.am:
        Changed paths to ndb include directory to include "storage"
      c41da42c
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ebb40c86
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      configure.in:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      ebb40c86
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · a1a09c45
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637
      
      
      sql/sql_yacc.yy:
        Auto merged
      a1a09c45
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 · 9bf4d9e5
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637
      
      
      sql/sql_yacc.yy:
        Auto merged
      9bf4d9e5
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-5.0-build · c68df141
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1-build
      
      
      Docs/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/benchmark/benchmark.dsp:
        Auto merged
      extra/yassl/taocrypt/taocrypt.dsp:
        Auto merged
      extra/yassl/taocrypt/taocrypt.vcproj:
        Auto merged
      extra/yassl/taocrypt/test.dsp:
        Auto merged
      extra/yassl/testsuite/testsuite.dsp:
        Auto merged
      extra/yassl/yassl.dsp:
        Auto merged
      extra/yassl/yassl.vcproj:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      strings/decimal.c:
        Auto merged
      c68df141
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · f0dd9dd3
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1-build
      
      
      sql-common/my_time.c:
        Auto merged
      f0dd9dd3
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 4c2a1ef0
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      4c2a1ef0
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1-build · 0907cd18
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      0907cd18
    • unknown's avatar
      BUG#20637: "load data concurrent infile" locks the table · d8d23348
      unknown authored
      Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
      inside a stored routine and MySQL is compiled with Query Cache support
      (this is not in the manual).
      
      The problem was that the condition test of "we are inside stored routine"
      was reversed, thus CONCURRENT _worked only_ from stored routine.  The
      solution is to use proper condition test.
      
      No test case is provided because the test case would require a large
      amount of input, and it's hard to tell is SELECT is really blocked or
      just slow (subject to race).
      
      
      sql/sql_yacc.yy:
        Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT,
        which was reversed, and return valid value if we are in SP.
      d8d23348
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 90ac2513
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
      
      90ac2513
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · e5cdaadc
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      e5cdaadc
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8d2295b5
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      8d2295b5
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · d1f8c80b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      d1f8c80b
    • unknown's avatar
      minor fix · 45366d19
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        remove dependency on Data::Dumper, it's not used anywhere
      45366d19
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · 76a41731
      unknown authored
      into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      sql/sql_parse.cc:
        Auto merged
      76a41731
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d1e66a3
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      server-tools/instance-manager/mysql_connection.cc:
        Rollback Monty's removals of explicit casts
      tests/mysql_client_test.c:
        SCCS merged
      6d1e66a3
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · bdbd71fd
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      tests/mysql_client_test.c:
        Manual merge: use local.
      bdbd71fd
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · bc13ba1b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
      
      bc13ba1b
    • unknown's avatar
      Varchar hack to clean strings removed. · 9925ea47
      unknown authored
      
      storage/archive/ha_archive.cc:
        Removed Varchar cleanup hack. I'm going to commit new pack code.
      9925ea47
  3. 28 Nov, 2006 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d29fcf6c
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/wait_for_socket.sh:
        Manual merge.
      sql/sql_cache.cc:
        Manual merge.
      d29fcf6c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a61be9aa
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      a61be9aa
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 83d029d4
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      sql/field.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      plugin/fulltext/plugin_example.c:
        e
        C
      sql/field.h:
        e
      83d029d4
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f6ad589b
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1-build
      
      
      client/mysql_upgrade.c:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      f6ad589b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 79e7d778
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-24486
      
      
      sql/sql_parse.cc:
        Auto merged
      79e7d778
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/51 · 722b5cba
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge
      
      
      client/mysql_upgrade.c:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        SCCS merged
      722b5cba
    • unknown's avatar
      A fix for Bug#24486 "Valgrind warnings: sp_head(), · 31855d98
      unknown authored
      deadlock_innodb:events_grant". This was a memory leak introduced by 
      the patch for Bug 22830.
      Post-review fixes.
      
      
      sql/sql_parse.cc:
        A fix for Bug#24486 "Valgrind warnings: sp_head(),
         deadlock_innodb:events_grant": delete the sphead object before
        returning with an error.
      31855d98