1. 16 Apr, 2005 3 commits
    • unknown's avatar
      Merge with 4.1 · 2be63528
      unknown authored
      
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/set_var.cc:
        Auto merged
      support-files/mysql.server.sh:
        Auto merged
      sql/ha_ndbcluster.cc:
        Merge
      sql/handler.cc:
        Merge
      sql/handler.h:
        Merge
      sql/mysqld.cc:
        Merge
      2be63528
    • unknown's avatar
      9b224e91
    • unknown's avatar
      Fixed core dump with long timezone names · 0327d05c
      unknown authored
      Don't abort on bootstrap if a wrong --default-storage-engine is specified
      
      
      sql/handler.cc:
        Combined code
      sql/mysqld.cc:
        Fixed core dump with long timezone names
        Don't abort on bootstrap if a wrong --default-storage-engine is specified
        Don't print strange messages if one sends 'kill' to a mysqld --bootstrap
      sql/set_var.cc:
        Indentaion change
      0327d05c
  2. 15 Apr, 2005 11 commits
  3. 14 Apr, 2005 26 commits
    • unknown's avatar
      A test case for Bug#4956 (decimal -> string conversion problem) · 9b583225
      unknown authored
      
      mysql-test/r/type_decimal.result:
        Test results (Bug#4956)
      mysql-test/t/type_decimal.test:
        A test case for Bug#4956 "strange result, insert into longtext, parameter 
        with numeric value" (the bug itself is not repeatable any more).
      9b583225
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.1 · 88e8c2a0
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      innobase/fil/fil0fil.c:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      88e8c2a0
    • unknown's avatar
      fil0fil.c: · ce22ebd0
      unknown authored
        Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped
      
      
      innobase/fil/fil0fil.c:
        Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped
      ce22ebd0
    • unknown's avatar
      Merge · 3c56b9a5
      unknown authored
      3c56b9a5
    • unknown's avatar
      Fixed BUG#9598: stored procedure call within stored procedure · e0fdbeba
      unknown authored
                      overwrites IN variable
        and added error checking of variables for [IN]OUT parameters while
        rewriting the out parameter handling.
      
      
      mysql-test/r/sp-error.result:
        New test case for non-variable argument for [IN]OUT parameters.
        (And changed to qualified names in some other error messages.)
      mysql-test/r/sp.result:
        New test case for BUG#9598.
      mysql-test/t/sp-error.test:
        New test case for non-variable argument for [IN]OUT parameters.
      mysql-test/t/sp.test:
        New test case for BUG#9598.
      sql/item.h:
        Need to distinguish between SP local variable items and other items,
        for error checking and [IN]OUT parameter handling.
      sql/share/errmsg.txt:
        New error message for non-variable arguments for [IN]OUT parameters in stored procedures.
      sql/sp_head.cc:
        Rewrote the [IN]OUT parameter handling in procedure invokation, to make
        it work properly when using user variables in sub-calls.
        Also added error checking for non-variable arguments for such parameters
        (and changed to qualified names for wrong number of arg. errors).
      sql/sp_rcontext.cc:
        No need to keep track on the out index for an [IN]OUT parameter any more.
      sql/sp_rcontext.h:
        No need to keep track on the out index for an [IN]OUT parameter any more.
      e0fdbeba
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 78bdb7d5
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      78bdb7d5
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8c2d44b7
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      8c2d44b7
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 42eca41c
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      42eca41c
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 19e8df03
      unknown authored
      into mysql.com:/export/space/pekka/ndb/version/my41
      
      
      19e8df03
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2fd65689
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      2fd65689
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/mysql-4.1 · 7480051b
      unknown authored
      into mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      7480051b
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/mysql-4.0 · 1b49d738
      unknown authored
      into mysql.com:/usr/home/ram/work/mysql-4.1
      
      
      client/mysqltest.c:
        Auto merged
      1b49d738
    • unknown's avatar
      BUG#9455 mysqladmin status crash the server · 7b8f4c6d
      unknown authored
       - Send error to client when mysql_change_db fails.
      
      
      sql/sql_db.cc:
        Added a note to comment for mysql_change_db that it will not send any error to the client.
      sql/sql_parse.cc:
        Call net_send_error(thd) if mysql_change_db fails.
        Remove comments claiming that mysql_change_db sends error the the client.
      7b8f4c6d
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · fa762a12
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      fa762a12
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-5.0 · b3fc44fa
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      
      b3fc44fa
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0a72f99e
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0.bit_class
      
      
      0a72f99e
    • unknown's avatar
      Bit type: fix for create_field::create_field(). · 27b2b1fa
      unknown authored
      
      sql/field.cc:
        Bit type: fix for create_field::create_field().
        We should return saved length in case of Field_bit_as_char.
      27b2b1fa
    • unknown's avatar
      Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4d68901e
      unknown authored
      into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-clean
      
      
      4d68901e
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-5.0 · 930e30e1
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      
      930e30e1
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 07ee7e07
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      07ee7e07
    • unknown's avatar
      ha_innodb.cc: · de8b4991
      unknown authored
        Add a big fat warning for future programmers that MySQL may call ::store_lock() also with lock 'type' TL_IGNORE; my ignorance of this caused bug 9670
      
      
      sql/ha_innodb.cc:
        Add a big fat warning for future programmers that MySQL may call ::store_lock() also with lock 'type' TL_IGNORE; my ignorance of this caused bug 9670
      de8b4991
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · c657ba2a
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/t/ctype_ucs_binlog.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      c657ba2a
    • unknown's avatar
      In order not to conflict with a Linux kernel header · 6a888c44
      unknown authored
      set_bit replaced with internal_set_bit,
      clear_bit replaced with internal_clear_bit.
      
      
      6a888c44
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 1c2c6bba
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      1c2c6bba
    • unknown's avatar
      information_schema.result, information_schema.test: · cfefd88d
      unknown authored
        Added a test in connection with the fix for
        bug #6106.
      view.result, view.test:
        Added test cases for bugs #6106/6107.
      sql_show.cc:
        The addition of the case for items of the type REF_ITEM in the
        function uses_only_table_name_fields became necessary after
        the fix for bug #6106.
      sql_base.cc:
        The problem was due to the fact that two different column
        references were glued together though one of them belonged to
        a subquery while another to an outer query. This caused
        eventually a wrong calculation of values for the used_tables
        attribute.
      
      
      sql/sql_base.cc:
        The problem was due to the fact that two different column
        references were glued together though one of them belonged to
        a subquery while another to an outer query. This caused
        eventually a wrong calculation of values for the used_tables
        attribute.
      sql/sql_show.cc:
        The addition of the case for items of the type REF_ITEM in the
        function uses_only_table_name_fields became necessary after
        the fix for bug #6106.
      mysql-test/t/view.test:
        Added test cases for bugs #6106/6107.
      mysql-test/r/view.result:
        Added test cases for bugs #6106/6107.
      mysql-test/t/information_schema.test:
        Added a test in connection with the fix for
        bug #6106.
      mysql-test/r/information_schema.result:
        Added a test in connection with the fix for
        bug #6106.
      cfefd88d
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · d10aba1b
      unknown authored
      into mysql.com:/export/space/pekka/ndb/version/my41
      
      
      d10aba1b