1. 29 Mar, 2005 1 commit
    • unknown's avatar
      mysql-test-run.pl: · 346d0241
      unknown authored
        Corrected typo
      mtr_diff.pl:
        A simplified unified diff in Perl
        new file
      
      
      mysql-test/lib/mtr_diff.pl:
        A simplified unified diff in Perl
      mysql-test/mysql-test-run.pl:
        Corrected typo
      346d0241
  2. 28 Mar, 2005 8 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5fb52827
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      5fb52827
    • unknown's avatar
      ndb - set up long key page vars in ACC_LOCKREQ (bug#????) · 4a641100
      unknown authored
      
      ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
        set up long key page vars in ACC_LOCKREQ
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        set up long key page vars in ACC_LOCKREQ
      4a641100
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · b9c6c482
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      b9c6c482
    • unknown's avatar
      ndb - make printSchemaFile available (compile manually) · e674f459
      unknown authored
      
      BitKeeper/deleted/.del-Makefile~b03e75f2bff8d72:
        Delete: ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile
      ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
        compile manually
      e674f459
    • unknown's avatar
      union.test: · e62a32a3
      unknown authored
        Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
        Prove that this problem was fixed with bug9425 fix too.
      
      
      mysql-test/t/union.test:
        Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
        Prove that this problem was fixed with bug9425 fix too.
      e62a32a3
    • unknown's avatar
      Bug#9425 A user variable doesn't always have implicit coercibility · f80b366f
      unknown authored
      Coercibility fixes for numeric types and not defined values were done.
      
      
      f80b366f
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 8fa1f65a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      8fa1f65a
    • unknown's avatar
      func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result: · 949875cb
      unknown authored
        Prove that the queries mentioned in
        Bugs#5980: NULL requires a characterset in a union
        works fine after recent changes related to itroducing
        more coercibility level: IRNORABLE and SYSCONST.
      
      
      mysql-test/r/ctype_utf8.result:
        Prove that the queries mentioned in
        Bugs#5980: NULL requires a characterset in a union
        works fine after recent changes related to itroducing
        more coercibility level: IRNORABLE and SYSCONST.
      mysql-test/r/func_system.result:
        Prove that the queries mentioned in
        Bugs#5980: NULL requires a characterset in a union
        works fine after recent changes related to itroducing
        more coercibility level: IRNORABLE and SYSCONST.
      mysql-test/t/ctype_utf8.test:
        Prove that the queries mentioned in
        Bugs#5980: NULL requires a characterset in a union
        works fine after recent changes related to itroducing
        more coercibility level: IRNORABLE and SYSCONST.
      mysql-test/t/func_system.test:
        Prove that the queries mentioned in
        Bugs#5980: NULL requires a characterset in a union
        works fine after recent changes related to itroducing
        more coercibility level: IRNORABLE and SYSCONST.
      949875cb
  3. 27 Mar, 2005 1 commit
  4. 26 Mar, 2005 4 commits
  5. 25 Mar, 2005 10 commits
  6. 24 Mar, 2005 8 commits
  7. 23 Mar, 2005 8 commits
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · c26930d2
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      c26930d2
    • unknown's avatar
      upgrade zlib to 1.2.2 · d4285cae
      unknown authored
      
      acinclude.m4:
        clarify help text
      d4285cae
    • unknown's avatar
      client/mysqltest.c · 58aeecb0
      unknown authored
          corrected number of fields for --enable_metadata
      sql/sql_union.cc
          fixed a apparent typo in assert
      
      
      client/mysqltest.c:
        corrected number of fields for --enable_metadata
      mysql-test/r/metadata.result:
        corrected number of fields for --enable_metadata
      mysql-test/r/ps_1general.result:
        corrected number of fields for --enable_metadata
      mysql-test/r/ps_2myisam.result:
        corrected number of fields for --enable_metadata
      mysql-test/r/ps_3innodb.result:
        corrected number of fields for --enable_metadata
      mysql-test/r/ps_4heap.result:
        corrected number of fields for --enable_metadata
      mysql-test/r/ps_5merge.result:
        corrected number of fields for --enable_metadata
      mysql-test/r/type_enum.result:
        corrected number of fields for --enable_metadata
      sql/sql_union.cc:
        fixed a apparent typo in assert
      58aeecb0
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1 · 2621e38b
      unknown authored
      into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
      
      
      2621e38b
    • unknown's avatar
      "After Monty's review" changes to the fix for BUG#8325 "Deadlock in... · 6bc324ed
      unknown authored
      "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
      s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
      no message on error log (deadlock is too common sometimes), a global counter
      instead (SHOW STATUS LIKE 'slave_retried_transactions').
      Plus a fix for libmysql/Makefile.shared
      
      
      libmysql/Makefile.shared:
        When we "make clean" in libmysql/ we remove the symlinks there, so we
        need to mark that they have to be recreated later: this is done by removing
        ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
        This Makefile.shared is used by libmysql_r too.
        No reason to remove linked_client_sources as we don't remove the links in client/.
      mysql-test/r/rpl_deadlock.result:
        result fix
      mysql-test/t/rpl_deadlock.test:
        small test addition
      sql/mysqld.cc:
        if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".
      sql/slave.cc:
        If slave retries automatically a transaction, no message on error log
        (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
        5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
        are usually resolved at first try. New global counter rli->retried_trans
        (for SHOW STATUS: total number of times the slave had to retry
        any transaction). safe_sleep() is thread-safe, sleep() was not.
        I change the rli->trans_retries counter to go from 0 to max instead
        of the other way (better for new sleep()).
      sql/slave.h:
        new global counter rli->retried_trans
      sql/sql_show.cc:
        SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
        Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
        when the static global status_vars is created (active_mi is set
        in init_slave()).
      sql/structs.h:
        new SHOW_SLAVE_RETRIED_TRANS
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      6bc324ed
    • unknown's avatar
      README: · d2ab1393
      unknown authored
        Fix typo.
      
      
      mysql-test/README:
        Fix typo.
      d2ab1393
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3315fab9
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      3315fab9
    • unknown's avatar
      Additional storage engine called "blackhole". Customer request, and for that... · 8a99997d
      unknown authored
      Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request.  With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.  
      
      
      acinclude.m4:
        New macro rule for ha_blackhole.
      configure.in:
        Rule enabling blackhole engine
      sql/Makefile.am:
        Additions to Makefile for blackhole engine
      sql/handler.cc:
        Ifdef enable code for blackhole (and message for "what does this thing do").
      sql/handler.h:
        Flag for storage engine type.
      sql/mysql_priv.h:
        Added blackhole type.
      sql/mysqld.cc:
        Updates for building backhole.
      sql/set_var.cc:
        Show variable for blackhole engine
      8a99997d