1. 25 Mar, 2005 1 commit
    • unknown's avatar
      Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.* · 2ec4480e
      unknown authored
        -skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables 
      
      
      mysql-test/r/information_schema.result:
        Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
      sql/sql_show.cc:
        Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
      2ec4480e
  2. 24 Mar, 2005 15 commits
  3. 23 Mar, 2005 22 commits
    • unknown's avatar
      Add the test case for Bug#8722 "prepared statement with view crashes · 941943c0
      unknown authored
      server" to the test suite, the bug is no longer repeatable.
      
      
      tests/mysql_client_test.c:
        The test case for Bug#8722 "prepared statement with view crashes server"
      941943c0
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 7c5e5b2c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      7c5e5b2c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 05fe0782
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      05fe0782
    • unknown's avatar
      Fix a valgrind warning spotted while trying to repeat Bug#7166 · 564e40da
      unknown authored
      "Server crashes when running out of connections"
      
      
      sql/sql_class.cc:
        thd->query_id is compared with thd->warn_id in push_warning, 
        THD::THD seems to be the best place to fix it.
      564e40da
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · a199cc20
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      a199cc20
    • 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
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b9a236a6
      unknown authored
      into mysql.com:/media/sda1/mysql/mysql-5.0-6282
      
      
      b9a236a6
    • unknown's avatar
      A test case for Bug#6282 "Packet error with SELECT INTO" · f0b89ba5
      unknown authored
      (the bug itself is no longer repeatable).
      
      
      mysql-test/r/variables.result:
        Results fixed (Bug#6282)
      mysql-test/t/variables.test:
        A test case for Bug#6282 "Packet error with SELECT INTO"
      f0b89ba5
    • 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
      sql/sql_acl.cc · c9659f0e
      unknown authored
          report correct errror in MODE_NO_AUTO_CREATE_USER
          cleanup
      after merge fixes
      
      
      mysql-test/r/grant2.result:
        updated after merge
      mysql-test/r/grant3.result:
        updated after merge
      mysql-test/r/rpl_temporary.result:
        sqlstate fixed
      mysql-test/t/grant2.test:
        updated after merge
      mysql-test/t/grant3.test:
        updated after merge
      sql/share/errmsg.txt:
        sqlstate fixed
      sql/sql_acl.cc:
        report correct errror in MODE_NO_AUTO_CREATE_USER
        cleanup
      c9659f0e
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · f869b2d5
      unknown authored
      into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
      
      
      f869b2d5
    • unknown's avatar
      Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 · c42e7c7b
      unknown authored
      into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
      
      
      c42e7c7b
    • unknown's avatar
      README: · d2ab1393
      unknown authored
        Fix typo.
      
      
      mysql-test/README:
        Fix typo.
      d2ab1393
    • unknown's avatar
      ha_innodb.cc: · bf8f321e
      unknown authored
        Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries
      
      
      sql/ha_innodb.cc:
        Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries
      bf8f321e
    • unknown's avatar
      A fix (bug #9309: Wrong order in INFORMATION_SCHEMA) · cd12c26a
      unknown authored
      
      
      strings/ctype-utf8.c:
        A fix (bug #9309: Wrong order in INFORMATION_SCHEMA)
        We should clear the last byte, not the next one.
      cd12c26a
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · a3762d79
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      a3762d79
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 226628d1
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      226628d1
    • unknown's avatar
      added symbols mysql_server_init and mysql_server_end to allow windows · 704b8576
      unknown authored
      applications with embedded server to connect to external servers too.
      (required for Connector/OO.org)
      
      
      704b8576
    • unknown's avatar
      merged · d27a709f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/ndb_autodiscover.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      scripts/fill_func_tables.sh:
        Auto merged
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      d27a709f
    • 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
      Merge bk-internal:/home/bk/mysql-5.0 · 903d1b6b
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      903d1b6b
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-5036 · 47a1612d
      unknown authored
      into mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      47a1612d
  4. 22 Mar, 2005 2 commits