1. 14 Apr, 2005 6 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e35ce16
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0.bit_class
      
      6e35ce16
    • unknown's avatar
      Bit type: fix for create_field::create_field(). · c7509989
      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.
      c7509989
    • unknown's avatar
      ha_innodb.cc: · afa111c2
      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
      afa111c2
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · ef78d3ce
      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
      ef78d3ce
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · f7ec9797
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      f7ec9797
    • unknown's avatar
      information_schema.result, information_schema.test: · 99584b9d
      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.
      99584b9d
  2. 13 Apr, 2005 27 commits
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/mysql-4.1 · d79f4051
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      mysys/default.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      d79f4051
    • unknown's avatar
      post review fix · af22097f
      unknown authored
      
      mysys/default.c:
        cleanup + check for the last line in the file in "!include" directive processing
      af22097f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 9f5ebec5
      unknown authored
      into mysql.com:/home/jimw/my/mysql-5.0-clean
      
      9f5ebec5
    • unknown's avatar
      Allow SQLCOM_CALL in prepared mode. · 67d8d63d
      unknown authored
      
      mysql-test/r/ps.result:
        Test results: adding tests for CALL statement in prepared mode.
      mysql-test/t/ps.test:
        Adding tests for CALL statement in prepared mode.
      67d8d63d
    • unknown's avatar
      Merge · a99d9aef
      unknown authored
      
      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
      sql/ha_innodb.cc:
        Auto merged
      scripts/make_binary_distribution.sh:
        SCCS merged
      a99d9aef
    • unknown's avatar
      Merge from 4.1 · e251a1d8
      unknown authored
      
      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
      e251a1d8
    • unknown's avatar
      ha_innodb.cc: · 20457882
      unknown authored
        Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
      
      
      sql/ha_innodb.cc:
        Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
      20457882
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6f0f7231
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      6f0f7231
    • unknown's avatar
      Fix ctype_ucs_binlog test when ucs2 not available · f4d1c474
      unknown authored
      
      mysql-test/t/ctype_ucs_binlog.test:
        Require ucs support
      f4d1c474
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 98440227
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      98440227
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · db00ad74
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      db00ad74
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · a335580f
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      a335580f
    • unknown's avatar
      Fixed BUG#9674: Stored Procs: Using declared vars in algebric operation · bc63127d
      unknown authored
                      causes system crash.
      
      
      mysql-test/r/sp.result:
        Added test case for BUG#9674.
      mysql-test/t/sp.test:
        Added test case for BUG#9674.
      sql/item.cc:
        Returning a pointer to a local variable is not a good idea.
        Better to use parameter which is there for exactly this purpose.
      bc63127d
    • unknown's avatar
      Merge · 59d31e7f
      unknown authored
      
      ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      59d31e7f
    • unknown's avatar
      Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found. · d6f420e9
      unknown authored
      
      mysql-test/r/sp.result:
        Added test case for BUG#6129.
      mysql-test/t/sp.test:
        Added test case for BUG#6129.
      sql/sp_pcontext.h:
        Only need one handler counter.
      sql/sql_yacc.yy:
        Count handlers correctly.
      d6f420e9
    • unknown's avatar
      Merge · da6b8a01
      unknown authored
      
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/dict/dict0load.c:
        Auto merged
      innobase/include/dict0dict.h:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/mi_dynrec.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      mysql-test/r/kill.result:
        Auto merged
      mysql-test/t/kill.test:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/main.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      da6b8a01
    • unknown's avatar
      fil0fil.c: · 921eb204
      unknown authored
        At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
      
      
      innobase/fil/fil0fil.c:
        At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
      921eb204
    • unknown's avatar
      Added test case for BUG#6129: Stored procedure won't display @@sql_mode value. · b0242911
      unknown authored
      
      mysql-test/r/sp.result:
        Added testcase for BUG#6129: Check that sql_mode is really set in mysql.proc.
      mysql-test/t/sp.test:
        Added testcase for BUG#6129: Check that sql_mode is really set in mysql.proc.
      b0242911
    • unknown's avatar
      row0sel.c: · 7294af60
      unknown authored
        Fix the patch of Jan to optimize next-key locking in searches of type 'primary key >= some value'
      
      
      innobase/row/row0sel.c:
        Fix the patch of Jan to optimize next-key locking in searches of type 'primary key >= some value'
      7294af60
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49d388b6
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      49d388b6
    • unknown's avatar
      row0sel.c: · 1f3bfc88
      unknown authored
        Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
      
      
      innobase/row/row0sel.c:
        Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
      1f3bfc88
    • unknown's avatar
      Merge · 1eab61f2
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      1eab61f2
    • unknown's avatar
      Fixed failed merge · 599aebd9
      unknown authored
      599aebd9
    • unknown's avatar
      Merge · 37172400
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      37172400
    • unknown's avatar
    • unknown's avatar
      Fixed a bug where next-key locking doesn't allow the insert which does · 502c6766
      unknown authored
      not produce phantom (bug #9354).
      
      502c6766
    • unknown's avatar
      Remove references to result.es files · 9666088f
      unknown authored
      
      mysql-test/Makefile.am:
        Remove reference to result.es
      scripts/make_binary_distribution.sh:
        Remove references to result.es
      9666088f
  3. 12 Apr, 2005 7 commits