1. 23 Sep, 2004 8 commits
    • unknown's avatar
      f2821fa1
    • unknown's avatar
      A fix and test case for bug#5688 "Upgraded 4.1.5 Server seg faults" · edcccfbc
      unknown authored
      
      mysql-test/r/ps.result:
        Test results fixed: the test case for bug#5688 "Upgraded 4.1.5 Server 
        seg faults"
      mysql-test/t/ps.test:
        Test case for bug#5688 "Upgraded 4.1.5 Server seg faults"
      sql/item_cmpfunc.cc:
        A fix for bug#5688 "Upgraded 4.1.5 Server seg faults":
        fix just another place where we use wrong memory root for an Item
        in statement prepare.
        In addition, make the check for charsets in Item_bool_func2
        more generic (fixes the test case when we use LIKE to compare BLOBs
        with TEXT data).
      edcccfbc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3f76fd69
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-memroot
      
      
      3f76fd69
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · fd5e254d
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5371
      
      
      fd5e254d
    • unknown's avatar
      Fix for BUG#5705: "SET CHARATER_SET_SERVERetc will be lost if STOP SLAVE before following query": · b76d3b4f
      unknown authored
      we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)
      
      
      mysql-test/r/rpl_charset.result:
        testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
      mysql-test/t/rpl_charset.test:
        testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
      sql/log_event.cc:
        we do not increment rli->group_master_log_pos if we are just after a SET
        ONE_SHOT, because SET ONE_SHOT should not be separated from its following
        updating query.
      b76d3b4f
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · abe4cd0e
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5371
      
      
      abe4cd0e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 412a052a
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-memroot
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      412a052a
    • unknown's avatar
      Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work · 7ba5d931
      unknown authored
      with memory roots in THD/Statement/Item_arena.
      Added assertions preventing memory allocation on bzero'ed MEM_ROOT since it is worked by 
      pure luck and was very ineffective.
      
      
      include/my_sys.h:
        Reimplementation of Monty's optimization of clear_alloc_root().
        Now clear_alloc_root() can be used only for detaching memory associated with MEM_ROOT
        (e.g. to avoid its freeing). It can not be used for MEM_ROOT initialization any longer 
        (it was bad idea anyway since memory allocation on such MEM_ROOT was very ineffective 
        and worked by pure luck).
        Introduced ALLOC_ROOT_MIN_BLOCK_SIZE constant.
      mysys/my_alloc.c:
        Added description of init_alloc_root().
        Added assertions to alloc_root() and reset_root_defaults() so now they can only be used
        on previosly initialized MEM_ROOT. (It worked for bzeroed MEM_ROOT before but 
        by pure luck and very inefficiently). Calling free_root() on bzero'ed MEM_ROOT
        is still ok (we can't remove this easily because of static MEM_ROOTs).
        Also now using ALLOC_ROOT_MIN_BLOCK_SIZE constant inside these functions.
      sql/opt_range.cc:
        Fixed get_quick_select_for_ref() function to not use bzero'ed MEM_ROOT for allocation.
        Also QUICK_RANGEs created in this function should be created in memory root of QUICK_SELECT.
      sql/sql_class.cc:
        Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work 
        with memory roots in THD/Statement/Item_arena.
        Now we are always initing THD::transaction.mem_root and THD::mem_root in THD constructor 
        (without memory allocation and with minimal block size) and then later change their
        parameters in THD::init_for_queries() (this is partially because we can't allocate anything
        on bzero'ed memory roots anymore).
        Item_arena() constructor is now trivial and is used only then Item_arena is created as backup
        storage for other Item_arena (we use Item_arena(bool) now if it is part of Statement).
        Both trivial Item_arena constructor and destructor are now inline.
        Removed unneeded clear_alloc_root from Item_arena::restore_backup_item_arena().
      sql/sql_class.h:
        Both trivial Item_arena constructor and destructor are now inline.
        Commented various Item_arena constructors.
      7ba5d931
  2. 22 Sep, 2004 2 commits
    • unknown's avatar
      Additional fix for bug #5136 (Geometry object is corrupted when queried) · 126ea49d
      unknown authored
      CREATE TABLE t1 SELECT POINT(1,2); fixed
      
      
      mysql-test/r/gis.result:
        Appropriate test result
      mysql-test/t/gis.test:
        test case
      sql/item_geofunc.cc:
        Item_geometry_func::fix_lengths_and_dec implementation
        several fix_length_and_dec's not needed now
      sql/item_geofunc.h:
        Item_geometry_func class presented
      126ea49d
    • unknown's avatar
      A fix and test case for Bug#5315 "mysql_change_user() doesn't free · ccf52b4f
      unknown authored
      prepared statements."
      
      
      include/hash.h:
        New declaration for hash_reset() function. The old version was not used.
      libmysql/client_settings.h:
        Declaration for mysql_detach_stmt_list().
      libmysql/libmysql.c:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        add call to mysql_detach_stmt_list(prepared statements) to
        mysql_change_user(): all statements are freed by server, so client
        counterparts need to be marked as not usable.
      mysys/hash.c:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        implementation of hash_reset(), which frees all hash elements
        and prepares the hash for reuse.
      sql-common/client.c:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        implementation of mysql_detach_stmt_list(): zero connection pointer
        in given statement list, thus marking given statements as not usable.
      sql/sql_class.cc:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        reset prepared statements map in THD::change_user().
      sql/sql_class.h:
        Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
        implementation of Statement_map::reset().
        A little cleanup of ~Statement_map(): first empty names_hash, as st_hash
        has a free function, which will delete statements.
      tests/client_test.c:
        A test case for bug #5315 "mysql_change_user() doesn't free prepared
        statements".
      ccf52b4f
  3. 21 Sep, 2004 6 commits
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · d594d40d
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      d594d40d
    • unknown's avatar
      bug#5591 · c7deb0d6
      unknown authored
      c7deb0d6
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 · 81dbc0f9
      unknown authored
      into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      81dbc0f9
    • unknown's avatar
      bug#5617 · e9e48115
      unknown authored
      allow blank lines in Ndb.cfg files
      
      
      e9e48115
    • unknown's avatar
      - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma" · 19b92eec
      unknown authored
         label for now)
       - tagged ChangeSet 1.2015.1.10 as "mysql-4.1.5"
      
      
      configure.in:
         - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
           label for now)
      19b92eec
    • unknown's avatar
      The major change for this changeset is the addition of code to handle: · 764ea714
      unknown authored
      OPTIMIZE TABLE <archive table>
      
      This recompresses the table, thus removing any additional gzip headers caused by opening/closing or flushing the table.
      
      
      mysql-test/r/archive.result:
        Added optimize test case for archive engine.
      mysql-test/t/archive.test:
        Added test case for OPTIMIZE table <archive table>
      sql/examples/ha_archive.cc:
        The big change was the addition of optimize() call to allow tables to be recompressed (so if you have been reading/writing/reading/writing and ending up with larger files then you should, this will solve it). Though adding this feature is going to make it a real headache to add row level locking. 
        Also fixed bug reported by JD where storage engine code was not functioning (this of course was because I didn't check for the propper return value for hash_init). Removed BROKEN_GZIP ifdef since there was no way to enable it.
      sql/examples/ha_archive.h:
        Added optimize() method.
      764ea714
  4. 20 Sep, 2004 9 commits
    • unknown's avatar
      fix updated signature · 76f06e4a
      unknown authored
      76f06e4a
    • unknown's avatar
      Merge msvensson@build.mysql.com:/home/bk/mysql-4.1 · a29a6637
      unknown authored
      into neptunus.(none):/home/magnus/mysql/mysql-4.1
      
      
      a29a6637
    • unknown's avatar
      Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 90bcde83
      unknown authored
      into mysql.com:/GORDON/MySQL/mysql-4.1/src
      
      
      90bcde83
    • unknown's avatar
      These modifications were part of WL#1856 Conversion of client_test.c tests... · 5a53ee4f
      unknown authored
      These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
      
      They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  
      
      Make the result sets (order of rows) more predictable by using ORDER BY.
      
      
      mysql-test/include/ps_modify.inc:
        Make the result sets more predictable by using ORDER BY
      mysql-test/include/ps_modify1.inc:
        Make the result sets more predictable by using ORDER BY
      mysql-test/r/ps_2myisam.result:
        updated results
      mysql-test/r/ps_3innodb.result:
        updated results
      mysql-test/r/ps_4heap.result:
        updated results
      mysql-test/r/ps_5merge.result:
        updated results
      mysql-test/r/ps_6bdb.result:
        updated results
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      5a53ee4f
    • unknown's avatar
      Ues buf pointer in get_ndb_value · 812a0749
      unknown authored
      Merge fixes
      
      
      mysql-test/r/ndb_insert.result:
        Correct test cases and result after merge
      mysql-test/t/ndb_insert.test:
        Correct test cases and result after merge
      sql/ha_ndbcluster.cc:
        Correct get_error_message after merge
        Use buf pointer in get_ndb_value
      812a0749
    • unknown's avatar
      bug#5659 · 7c4eee90
      unknown authored
      uninit variable
      
      
      ndb/src/kernel/vm/Configuration.cpp:
        init variable
      7c4eee90
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 96bf8030
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      96bf8030
    • unknown's avatar
      Merged new ndb_insert.test and .result · c06c0078
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      mysql-test/r/ndb_insert.result:
        Merge new test cases
      mysql-test/t/ndb_insert.test:
        Merge new test cases
      c06c0078
    • unknown's avatar
      Merge msvensson@build.mysql.com:/home/bk/mysql-4.1 · 8b79d2b5
      unknown authored
      into neptunus.(none):/home/magnus/mysql/mysql-4.1
      
      
      8b79d2b5
  5. 17 Sep, 2004 1 commit
    • unknown's avatar
      A fix and test case for bug#5510 "inserting Null in AutoIncrement primary · 52683755
      unknown authored
      key Column Fails".
      
      
      mysql-test/r/ps.result:
        Test results updated: a test case for Bug#5510 "inserting Null in 
        AutoIncrement primary key Column Fails".
      mysql-test/r/ps_2myisam.result:
        Bug#5510: a different warning in case of NULL->default truncation.This is 
        OK, the new warning is the same as produced by conventional execution.
      mysql-test/r/ps_3innodb.result:
        Bug#5510: a different warning in case of NULL->default truncation.This is 
        OK, the new warning is the same as produced by conventional execution.
      mysql-test/r/ps_4heap.result:
        Bug#5510: a different warning in case of NULL->default truncation.This is 
        OK, the new warning is the same as produced by conventional execution.
      mysql-test/r/ps_5merge.result:
        Bug#5510: a different warning in case of NULL->default truncation.This is 
        OK, the new warning is the same as produced by conventional execution.
      mysql-test/r/ps_6bdb.result:
        Bug#5510: a different warning in case of NULL->default truncation.This is 
        OK, the new warning is the same as produced by conventional execution.
      mysql-test/t/ps.test:
        A test case for Bug#5510 "inserting Null in AutoIncrement primary key Column 
        Fails".
      sql/item.cc:
        A fix for bug#5510 "inserting Null in AutoIncrement primary key Column 
        Fails": use proper Field API function for NULL placholeders.
      52683755
  6. 16 Sep, 2004 14 commits