1. 17 Nov, 2005 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 47044ea6
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2
      
      
      47044ea6
    • unknown's avatar
      Fix for bug #13399 Crash when executing PS/SP which should activate trigger · d518f702
      unknown authored
      which is now dropped" and bug #12329 "Bogus error msg when executing PS with
      stored procedure after SP was re-created".
      
      
      mysql-test/r/sp-error.result:
        Added test for bug #12329 "Bogus error msg when executing PS with stored
        procedure after SP was re-created".
      mysql-test/r/trigger.result:
        Added test for bug #13399 Crash when executing PS/SP which should activate
        trigger which is now dropped".
      mysql-test/t/sp-error.test:
        Added test for bug #12329 "Bogus error msg when executing PS with stored
        procedure after SP was re-created".
      mysql-test/t/trigger.test:
        Added test for bug #13399 Crash when executing PS/SP which should activate
        trigger which is now dropped".
      sql/sp_head.cc:
        sp_head::add_used_tables_to_table_list():
          We have to copy database/table names and alias to PS/SP memory since current
          instance of sp_head object can pass away before next execution of PS/SP for
          which tables are added to prelocking list.
          This will be fixed by introducing of proper invalidation mechanism once new
          TDC is ready.
      d518f702
    • unknown's avatar
      A fix and a test case for Bug#14077 "Failure to replicate a stored · b6707610
      unknown authored
      function with a cursor". Enable execution of SELECT queries in SP on slave.
      
      
      mysql-test/r/rpl_sp.result:
        Test results were fixed (Bug#14077).
      mysql-test/t/rpl_sp.test:
        Add a test case for Bug#14077 "Failure to replicate a stored 
        function with a cursor".
      sql/sql_parse.cc:
        Do not rewrite SELECTs with DOs on slave: if this SELECT was for a stored
        routine cursor, slave must be able to execute the SELECT in order to
        open a cursor.
        At the moment the bug is present only in stored functions and stored
        procedures called from stored functions, because, due to
        stored procedure unfolding for replication, top level stored procedures
        are never executed on slave.
      b6707610
  2. 16 Nov, 2005 12 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4d899772
      unknown authored
      into  mysql.com:/export/space/pekka/ndb/version/my50
      
      
      4d899772
    • unknown's avatar
      Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 48e91809
      unknown authored
      into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
      
      
      48e91809
    • unknown's avatar
      Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5951caea
      unknown authored
      into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
      
      
      5951caea
    • unknown's avatar
      Bug#14616 - Freshly imported table returns error 124 when using LIMIT · cd1abd99
      unknown authored
      After merge fix.
      
      
      cd1abd99
    • unknown's avatar
      bug#14433 - archive uses wrong ref_length · dcf5d348
      unknown authored
      
      mysql-test/t/func_group.test:
        re-enable the test
      dcf5d348
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · a2f4bd83
      unknown authored
      into  mysql.com:/export/space/pekka/ndb/version/my50
      
      
      a2f4bd83
    • unknown's avatar
      ndb - bug#14007 5.0 *** does not automerge into 5.1 *** · 74dcfd25
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        bug#14007 5.0
      mysql-test/t/ndb_charset.test:
        bug#14007 5.0
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        bug#14007 5.0
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        bug#14007 5.0
      ndb/src/kernel/vm/SimulatedBlock.hpp:
        bug#14007 5.0
      74dcfd25
    • unknown's avatar
      Issuing error about presence of commit/rollback statements in stored functions... · 8a661e77
      unknown authored
      Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627)
      
      The crash mentioned in original bug report is already prevented by one
      of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
      don't commit the transaction (inconsistency)"), this patch only improve
      error returning.
      
      
      mysql-test/r/sp-error.result:
        Test that statements which implicitly commit transaction
      mysql-test/t/sp-error.test:
        Test that statements which implicitly commit transaction
      sql/sp_head.cc:
        We set the new flag about commit/rollback statements presence
      sql/sp_head.h:
        The new flag about commit/rollback presence added
        A comment fixed
      sql/sql_yacc.yy:
        Removed commit/rollback-statement-present errors spread by this file, only one check left which check flags of a SP
      8a661e77
    • unknown's avatar
      DbtupRoutines.cpp: · 821cd17c
      unknown authored
        Auto merged
      
      
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Auto merged
      821cd17c
    • unknown's avatar
      ndb - bug#14007 4.1 [re-commit for LenZ merge] · 563e5c8d
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        bug#14007 test [re-commit]
      mysql-test/t/ndb_charset.test:
        bug#14007 test [re-commit]
      ndb/include/kernel/AttributeDescriptor.hpp:
        bug#14007 4.1 need getSizeInBytes [re-commit]
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]
      563e5c8d
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-4100 · 6506fb32
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      mysql-test/r/handler.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/mysql_priv.h:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Manual merge.
      sql/sql_base.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Manual merge.
      sql/sql_handler.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Manual merge.
      sql/sql_table.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Manual merge.
      6506fb32
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · d49bd3b6
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      d49bd3b6
  3. 15 Nov, 2005 12 commits
    • unknown's avatar
      Merge · 9de8e3b0
      unknown authored
      
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      9de8e3b0
    • unknown's avatar
      Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash · 013b3d8a
      unknown authored
      Version for 5.0.
      It fixes three problems:
      1. The cause of the bug was that we did not check the table version for
       the HANDLER ... READ commands. We did not notice when a table was
       replaced by a new one. This can happen during ALTER TABLE, REPAIR
       TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
       for this problem "the primary bug fix".
      2. mysql_ha_flush() was not always called with a locked LOCK_open.
       Though the function comment clearly said it must.
       I changed the code so that the locking is done when required. I call
       the fix for this problem "the secondary fix".
      3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
       concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
       problem "the 5.0 addendum fix".
      
      
      include/my_pthread.h:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Added a new macro for the 5.0 addendum fix.
      mysql-test/r/handler.result:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        The test result.
      mysql-test/t/handler.test:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        The test case.
      sql/lock.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Changed a comment which did confuse me and which is not fully
        correct anymore after the 5.0 addendum fix.
        Added an assertion which would fire without the 5.0 addendum fix.
      sql/mysql_priv.h:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Changed a definition for the secondary fix.
      sql/sql_base.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Changed function calls for the secondary fix.
      sql/sql_class.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Changed a function call for the secondary fix.
      sql/sql_handler.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        The first two diffs make the primary bug fix.
        The rest is for the secondary fix.
      sql/sql_table.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        The first diff (four changed places) make the 5.0 addendum fix.
        The other three are changed function calls for the secondary fix.
      013b3d8a
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 37abfebb
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
      
      
      37abfebb
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · baee965b
      unknown authored
      into moonbone.local:/work/14850-bug-5.0-mysql
      
      
      baee965b
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · bb349787
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
      
      
      myisam/ft_parser.c:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      bb349787
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.0-4000 · faaf53d9
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      mysql-test/r/handler.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      mysql-test/t/handler.test:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Manual merge.
      sql/sql_handler.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Manual merge.
      sql/sql_table.cc:
        Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
        Manual merge.
      faaf53d9
    • unknown's avatar
      Bug#14616 - Freshly imported table returns error 124 when using LIMIT · 67522672
      unknown authored
      After merge fix.
      
      
      67522672
    • unknown's avatar
      Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138) · 69fae29c
      unknown authored
      
      mysql-test/r/analyze.result:
        Test suite for BUG#13673
      mysql-test/t/analyze.test:
        Test suite for BUG#13673
      69fae29c
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.0-bug14397 · 15062e97
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.0-4000
      
      
      15062e97
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.0-bug14616 · b0a5184d
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      mysql-test/r/myisam.result:
        Bug#14616 - Freshly imported table returns error 124 when using LIMIT
        Manual merge.
      mysql-test/t/myisam.test:
        Bug#14616 - Freshly imported table returns error 124 when using LIMIT
        Manual merge.
      sql/sql_select.cc:
        Bug#14616 - Freshly imported table returns error 124 when using LIMIT
        Manual merge.
      b0a5184d
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · d9c7aaf2
      unknown authored
      into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
      
      
      d9c7aaf2
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f3146bb
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      7f3146bb
  4. 14 Nov, 2005 12 commits
    • unknown's avatar
      Fix bug #14816 test_if_order_by_key() expected only Item_fields. · 0a9badec
      unknown authored
      test_if_order_by_key() expected only Item_fields to be in order->item, thus
      failing to find available index on view's field, which results in reported
      error.
      
      Now test_if_order_by_key() calls order->item->real_item() to get field for
      choosing index.
      
      
      sql/sql_select.cc:
        Fix bug #14816 test_if_order_by_key() expected only Item_fields.
        Make test_if_order_by_key() use real_item() to get field.
      mysql-test/r/view.result:
        Test case for bug#14816 test_if_order_by_key() expected only Item_fields.
      mysql-test/t/view.test:
        Test case for bug#14816 test_if_order_by_key() expected only Item_fields.
      0a9badec
    • unknown's avatar
      Fix bug #14850 Item_ref's null_value wasn't updated · 6c708fad
      unknown authored
      Item_ref's null_value wasn't updated in save_org_in_field() causing reported
      error.
      
      
      sql/item.h:
        Fix bug #14850 Item_ref's null_value wasn't updated
        Make save_org_in_field() update Item_ref's null_value.
      mysql-test/r/view.result:
        Test case for bug #14850 Item_ref's null_value wasn't updated
      mysql-test/t/view.test:
         Test case for bug #14850 Item_ref's null_value wasn't updated
      6c708fad
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 14637f97
      unknown authored
      into  selena.:H:/MYSQL/src/#14569-mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      14637f97
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 4760021e
      unknown authored
      into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
      
      
      4760021e
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · ed419a32
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      ed419a32
    • unknown's avatar
    • unknown's avatar
    • unknown's avatar
      Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel · 57a752f4
      unknown authored
      into  selena.:H:/MYSQL/bkt/mysql-5.0
      
      
      57a752f4
    • unknown's avatar
      Fixes bug #13377. my_open() & my_create() functions changed to use · 303cae4c
      unknown authored
      my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
      allow deleting opened files. my_sopen() implementation is added to
      support this functionality.
      
      
      include/my_global.h:
        Fixes bug #13377. Added number of constants for share delete file
        open option.
      include/my_sys.h:
        Fixes bug #13377. Added my_sopen function.
      mysys/my_create.c:
        Fixes bug #13377. my_create() function changed to use my_sopen() and which allows
        to use FILE_SHARE_DELETE flag on win32, which helps in deleting opened files.
      mysys/my_open.c:
        Fixes bug #13377. my_open() function changed to use my_sopen() on win32
        which allows to use FILE_SHARE_DELETE flag to allow deleting opened files.
      sql/log.cc:
        Fixes bug #13377. Additional patch - remove reference counting for
        opened binlog files, introduced in initial patch of #13377.
      sql/sql_class.h:
        Fixes bug #13377. Additional patch - remove reference counting for
        opened binlog files, introduced in initial patch of #13377.
      sql/sql_repl.cc:
        Fixes bug #13377. Additional patch - remove reference counting for
        opened binlog files, introduced in initial patch of #13377.
      303cae4c
    • unknown's avatar
      Fixed number of compiler errors on win32. · 67df0e19
      unknown authored
      
      VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
        Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.
      sql/ha_innodb.cc:
        Fixed compiler error for Win32 build.
      sql/spatial.cc:
        Fixed compiler error for Win32 build. float8get should be enclosed
        in {} since it is macro on win32 and might cause unmatching blocks.
      67df0e19
    • unknown's avatar
      config-win.h: · 63bbb151
      unknown authored
        Disabled yaSSL support for now
      
      
      include/config-win.h:
        Disabled yaSSL support for now
      63bbb151
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca · 0deb1f55
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      0deb1f55
  5. 13 Nov, 2005 1 commit
    • unknown's avatar
      mysql-test-run.pl: · c2826d72
      unknown authored
        Corrected search for 'mysqlimport' executable
      
      
      mysql-test/mysql-test-run.pl:
        Corrected search for 'mysqlimport' executable
      c2826d72