1. 13 Jul, 2005 28 commits
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-11458 · b7033fb3
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      configure.in:
        Manual merge
      mysql-test/r/ps.result:
        Manual merge
      mysql-test/t/ps.test:
        Manual merge
      b7033fb3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 51ce56e6
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      51ce56e6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e064ca31
      unknown authored
      into  mysql.com:/opt/local/work/mysql-4.1-11458
      
      
      e064ca31
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-11458 · 91c97a76
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge.
      mysql-test/t/ps.test:
        Manual merge.
      sql/item.cc:
        Manual merge.
      sql/item.h:
        Manual merge.
      sql/item_subselect.h:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_prepare.cc:
        Manual merge.
      91c97a76
    • unknown's avatar
      Cleanup after test for Bug#11458 · f5c8f42f
      unknown authored
      f5c8f42f
    • unknown's avatar
      4.1.13 has been cloned off · 5ef54bb9
      unknown authored
      
      configure.in:
        Increase version number to 4.1.14, as the clone for 4.1.13 has been created.
      5ef54bb9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7a0f6d52
      unknown authored
      into  mysql.com:/opt/local/work/mysql-4.1-11458
      
      
      sql/mysql_priv.h:
        Auto merged
      7a0f6d52
    • unknown's avatar
      - a fix for Bug#11458 "Prepared statement with subselects return random · ece17ba3
      unknown authored
      data": remove the fix for another bug (8807) that
      added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
      to prevent their evaluation at prepare. As this bit hanged in 
      Item_subselect::used_tables_cache for ever, a constant subquery with
      a placeholder was never evaluated as such, which caused wrong 
      choice of the execution plan for the statement.
      - to fix Bug#8807 backport a better fix from 5.0
      - post-review fixes.
      
      
      mysql-test/r/ps.result:
        Bug#11458: test results fixed
      mysql-test/t/ps.test:
        - add a test case for Bug#11458 "Prepared statement with subselects return 
        random data"
      sql/item.cc:
        - remove unnecessary Item_param::fix_fields
        - fix Item_param::set_null to set item_type accordingly (safety:
          Item_param should behave like a basic constant).
      sql/item.h:
        Remove Item_param::fix_fields
      sql/item_subselect.h:
        Remove no more existing friend.
      sql/mysql_priv.h:
        Add UNCACHEABLE_PREPARE to mark all subqueries as uncacheable if
        in statement prepare (backport from 5.0).
      sql/sql_lex.h:
        Comment fixed.
      sql/sql_parse.cc:
        If in statement prepare, mark all subqueries as uncacheable (backport
        from 5.0)
      sql/sql_prepare.cc:
        Switch off the uncacheable flag from all subqueries after statement
        prepare is done (backport from 5.0)
      ece17ba3
    • unknown's avatar
      sql_update.cc: · 859ccd3b
      unknown authored
        mysql_update(): Call handler::unlock_row()
        also in the first while loop.
        This patch is from Heikki,
        and it was approved by Sergei Golubchik.
      
      
      sql/sql_update.cc:
        mysql_update(): Call handler::unlock_row()
        also in the first while loop.
        This patch is from Heikki,
        and it was approved by Sergei Golubchik.
      859ccd3b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7001961e
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
      
      
      7001961e
    • unknown's avatar
      Fixed trigger.test after fixing bug #11554 "Server crashes on statement · 02bfa710
      unknown authored
      indirectly using non-cached function".
      
      
      mysql-test/r/trigger.result:
        Fixed test case after fixing bug #11554 "Server crashes on statement
        indirectly using non-cached function".
      mysql-test/t/trigger.test:
        Fixed test case after fixing bug #11554 "Server crashes on statement
        indirectly using non-cached function".
      02bfa710
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 · 7310c345
      unknown authored
      into mysql.com:/home/bk/bXXX-mysql-5.0
      
      
      mysql-test/r/rpl_deadlock.result:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      7310c345
    • unknown's avatar
      Bug#11905: Tables used in rpl_deadlock are not dropped at the · ecd1ea93
      unknown authored
      end of the test, causing subsequent tests to fail.
      
      
      mysql-test/r/rpl_deadlock.result:
        Result change.
      mysql-test/t/rpl_deadlock.test:
        Tables used in the test but not dropped.
      ecd1ea93
    • unknown's avatar
      Post-merge fix · 52adc14e
      unknown authored
      52adc14e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9aa15040
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
      
      
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/share/errmsg.txt:
        Manual merge.
      sql/sp.cc:
        Manual merge.
      9aa15040
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 3b7a17d8
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      3b7a17d8
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ea8a511
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      9ea8a511
    • unknown's avatar
    • unknown's avatar
      Implementation of Monty's idea: Now we can open mysql.proc table for lookup · 11f9e513
      unknown authored
      of stored routines definitions even if we already have some tables open and
      locked. To avoid deadlocks in this case we have to put certain restrictions
      on locking of mysql.proc table.
      
      This allows to use stored routines safely under LOCK TABLES without explicitly
      mentioning mysql.proc in the list of locked tables. It also fixes bug #11554
      "Server crashes on statement indirectly using non-cached function".
      
      
      mysql-test/r/sp-error.result:
        Added test which checks that now we can read stored routines definitions
        under LOCK TABLES even if we have not locked mysql.proc explicitly. Also
        added check for restrictions which this ability puts on mysql.proc locking.
        Updated test for bug #9566 to correspond this new situation.
      mysql-test/r/sp-threads.result:
        Added test for bug #11554 "Server crashes on statement indirectly using
        non-cached function".
      mysql-test/t/sp-error.test:
        Added test which checks that now we can read stored routines definitions
        under LOCK TABLES even if we have not locked mysql.proc explicitly. Also
        added check for restrictions which this ability puts on mysql.proc locking.
        Updated test for bug #9566 to correspond this new situation.
      mysql-test/t/sp-threads.test:
        Added test for bug #11554 "Server crashes on statement indirectly using
        non-cached function".
      sql/lock.cc:
        get_lock_data():
         To be able to open and lock for reading system tables like 'mysql.proc',
         when we already have some tables opened and locked, and avoid deadlocks
         we have to disallow write-locking of these tables with any other tables.
      sql/mysql_priv.h:
        open_table() has new parameter which allows to open table even if some-one
        has done a flush or holding namelock on it.
      sql/share/errmsg.txt:
        Added error message saying that one cannot write-lock some of system tables
        with any other tables.
      sql/sp.cc:
        open_proc_table_for_read()/close_proc_table():
          Added functions to be able open and close mysql.proc table when we already
          have some tables open and locked.
        open_proc_table_for_update():
          Added function to simplify opening of mysql.proc for updates.
        db_find_routine_aux()/db_find_routine()/db_update_routine()/...
          Moved responsibility for opening mysql.proc table from db_find_routine_aux()
          one level up, since this level knows better which type of table access for
          reading of for update it needs.
        sp_function_exists():
          Removed unused function.
      sql/sp.h:
        sp_function_exists():
          Removed unused function.
      sql/sql_base.cc:
        open_table():
          Added new parameter which allows to open table even if some-one has done a
          flush or holding namelock on it.
        open_unireg_entry():
          Mark 'mysql.proc' as a system table which has special restrictions on its
          locking, but thanks to them can be open and locked even if we already have
          some open and locked.
      sql/sql_class.cc:
        Moved THD members holding information about open and locked tables to separate
        Open_tables_state class to be able to save/restore this state easier.
        Added THD::push_open_tables_state()/pop_open_tables_state() methods for
        saving/restoring this state.
      sql/sql_class.h:
        Moved THD members holding information about open and locked tables to separate
        Open_tables_state class to be able to save/restore this state easier.
        Added THD::push_open_tables_state()/pop_open_tables_state() methods for
        saving/restoring this state.
      sql/sql_lex.cc:
        Removed LEX::proc_table member which was not really used.
      sql/sql_lex.h:
        Removed LEX::proc_table member which was not really used.
      sql/sql_table.cc:
        open_table() has new parameter which allows to open table even if some-one
        has done a flush or holding namelock on it.
      sql/table.h:
        Added TABLE_SHARE::system_table indicating that this table is system table
        like 'mysql.proc' and we want to be able to open and read-lock it even when
        we already have some tables open and locked (and because of this we have
        to put some restrictions on write locking it).
      11f9e513
    • unknown's avatar
      Bug #9854 hex() and out of range handling · 3ae23d5b
      unknown authored
        added out of range handling
      
      
      3ae23d5b
    • unknown's avatar
      897a8d0f
    • unknown's avatar
      a fix (bug #11808: Test case 'mysql_client_test' fails in assert 'double_data == o_double_data') · e90a26a2
      unknown authored
      
      tests/mysql_client_test.c:
        a fix (bug #11808: Test case 'mysql_client_test' fails in assert 'double_data == o_double_data')
        cmp_double() introduced in order to avoid using long double registers                                   
        (for local double vars).
      e90a26a2
    • unknown's avatar
      Manual merge · d52f68f3
      unknown authored
      d52f68f3
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0 · 338325a0
      unknown authored
      into  mysql.com:/home/bk/mysql-5.0
      
      
      338325a0
    • unknown's avatar
      Merge · 327afd65
      unknown authored
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      327afd65
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c3d27616
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11709
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      c3d27616
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 · 8daa1c42
      unknown authored
      into  mysql.com:/home/bk/mysql-5.0
      
      
      BitKeeper/etc/config:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/des_key_file.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      vio/vio.c:
        Auto merged
      vio/viosocket.c:
        Auto merged
      sql/log.cc:
        Manual merge
      sql/slave.cc:
        Manual merge
      8daa1c42
    • unknown's avatar
      view.result, view.test: · 8c182f97
      unknown authored
        Fix for test case for bug#11709
      
      
      mysql-test/t/view.test:
        Fix for test case for bug#11709
      mysql-test/r/view.result:
        Fix for test case for bug#11709
      8c182f97
  2. 12 Jul, 2005 12 commits
    • unknown's avatar
      Merge · 7744e7e7
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      7744e7e7
    • unknown's avatar
      Fix bug#11709 View was ordered by wrong column. · a578be33
      unknown authored
      When searching column to sort on, item was compared to field under view
      column, but not the column itself. Because names of view column and underlaid
      field may differ, it leads to possibly choosing wrong column for sorting on.
      
      This patch makes Item_direct_view_ref::eq(Item *item,...) compare
      item's name with it's own name proir to comparing to *ref item.
      
      
      sql/item.cc:
        Fix bug #11709 View was ordered by wrong column
      sql/item.h:
        Fix bug #11709 View was ordered by wrong column
      mysql-test/t/view.test:
        Test case for bug #11709 View was ordered by wrong column.
      mysql-test/r/view.result:
        Test case for bug #11709 View was ordered by wrong column.
      a578be33
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0 · 1c8ef0cb
      unknown authored
      into  mysql.com:/home/bk/mysql-5.0
      
      
      1c8ef0cb
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 08240bbe
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-5.0
      
      
      08240bbe
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · ff7db9bf
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      
      ff7db9bf
    • unknown's avatar
      view.test, view.result: · f6280284
      unknown authored
        Expanded the test case for bug #6120 to cover
        DROP VIEW / CREATE VIEW scenario.
      sql_view.cc:
        Expanded the fix for bug #6120 to cover the case of
        DROP VIEW / CREATE_VIEW.
      
      
      sql/sql_view.cc:
        Expanded the fix for bug #6120 to cover the case of
        DROP VIEW / CREATE_VIEW.
      mysql-test/r/view.result:
        Expanded the test case for bug #6120 to cover
        DROP VIEW / CREATE VIEW scenario.
      mysql-test/t/view.test:
        Expanded the test case for bug #6120 to cover
        DROP VIEW / CREATE VIEW scenario.
      f6280284
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 51f8821a
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-5.0
      
      
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      51f8821a
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · b93991e9
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      
      b93991e9
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 338259ad
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug11821-merge
      
      
      338259ad
    • unknown's avatar
      Fix for BUG#11821 manually merged · 6c9d93eb
      unknown authored
      
      sql/item.cc:
        Auto merged
      6c9d93eb
    • unknown's avatar
      Merge · 9d9ef52d
      unknown authored
      
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      9d9ef52d
    • unknown's avatar
      Fix bug #11399 Column alias was lost during view preraration. · 2ae3cdcf
      unknown authored
      New item created in find_field_in_table() to fix view's item, was created 
      without taking into account original item's alias. This patch checks if alias 
      is set to the original item and if so sets it to newly created item.
      
      
      sql/sql_base.cc:
        Fix bug#11399 Alias wasn't set on view column
      mysql-test/t/view.test:
        Test case for bug#11399 Use an alias in a select statement on a view
      mysql-test/r/view.result:
        Test case for bug#11399 Use an alias in a select statement on a view
      2ae3cdcf