1. 21 Jul, 2005 3 commits
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0b732c47
      unknown authored
      into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
      
      
      include/my_sys.h:
        Auto merged
      include/thr_lock.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      client/mysqldump.c:
        Manual merge
      include/mysql.h:
        Manual merge
      libmysql/libmysql.c:
        Manual merge
      myisam/rt_split.c:
        Manual merge
      mysys/thr_lock.c:
        Manual merge
      sql/lock.cc:
        Manual merge
      sql/mysql_priv.h:
        Manual merge
      sql/sql_base.cc:
        Manual merge
      sql/sql_table.cc:
        Manual merge
      tests/mysql_client_test.c:
        Manual merge
      0b732c47
    • unknown's avatar
      Fix merge · 31ebc6ef
      unknown authored
      31ebc6ef
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0 · a3fe7652
      unknown authored
      into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
      
      
      include/thr_lock.h:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_table.cc:
        Manual merge after 4.0 fix
      a3fe7652
  2. 20 Jul, 2005 22 commits
    • unknown's avatar
      Bug #10600 After review fixes · af1dfb61
      unknown authored
      
      sql/lock.cc:
        Used flags immediately in call
      sql/mysql_priv.h:
        Added RTFC (short for remove_table_from_cache)
        for constants and used hex syntax to clarify it is bits
        in the flags
      sql/sql_base.cc:
        Use flags parameter immediately and use flags immediately in call
        Change to other variant of eternal loop variant
      sql/sql_table.cc:
        Use flags immediately in call
      af1dfb61
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 1ef3c696
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      1ef3c696
    • unknown's avatar
      Fix date conversion on 32-bit machines. · 8607be22
      unknown authored
      
      sql/field.cc:
        Fix type of temporary variables for handling result of
        number_to_datetime().
      8607be22
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · bf4dfde9
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      bf4dfde9
    • unknown's avatar
      Bug #12055 NDB temp tables created by ALTER TABLE are usable · 1145f448
      unknown authored
      - do not discover temporary files and make them visible
      
      
      1145f448
    • unknown's avatar
      Upgraded the version number, as 5.0.10 is cloned off. · 45a43c21
      unknown authored
      This push includes the clone tag.
      
      
      configure.in:
        Upgraded the version number, as 5.0.10 is cloned off.
      45a43c21
    • unknown's avatar
      Implement MySQL framework to support consistent read views in · ec55fec9
      unknown authored
      cursors. This should fix Bug#11813 when InnoDB part is in 
      (tested with a draft patch).
      The idea of the patch is that if a storage engine supports
      consistent read views, we open one when open a cursor,
      set is as the active view when fetch from the cursor, and close
      together with cursor close.
      
      
      sql/examples/ha_archive.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/examples/ha_example.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/examples/ha_tina.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/ha_berkeley.cc:
        - extend handlerton with cursors methods
      sql/ha_blackhole.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/ha_federated.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/ha_heap.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/ha_innodb.cc:
        - extend handlerton with cursors methods
      sql/ha_myisam.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/ha_myisammrg.cc:
        - extend handlerton with cursors methods; fix coding style
      sql/ha_ndbcluster.cc:
        - extend handlerton with cursors methods
      sql/handler.h:
        - extend handlerton with cursors methods
      sql/sql_select.cc:
        - create a consistent read view when we open a cursor,
          set it for a fetch, and free when we closing the cursor.
      sql/sql_select.h:
        - add Cursor::ht_info to remember read views used in a cursor.
      tests/mysql_client_test.c:
        Disable an assert that will be no longer valid when consistent
        read views in InnoDB are used.
      ec55fec9
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1 · 21038e65
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
      
      
      tests/mysql_client_test.c:
        Auto merged
      21038e65
    • unknown's avatar
      cs fixes from last commit · 6147be6e
      unknown authored
      6147be6e
    • unknown's avatar
      Added some missing casts and changed a define for alloca(). · 44589256
      unknown authored
      
      client/mysqldump.c:
        Added casts.
      include/my_sys.h:
        Define for alloca() changed for Metrowerks compiler.
      myisam/rt_split.c:
        Added cast.
      44589256
    • unknown's avatar
      Fix warnings/compilation failures reported by Jan Lindstrom · b6823b66
      unknown authored
      
      sql/field.cc:
        Fix warnings/compilation failures.
      b6823b66
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3abb8116
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      
      3abb8116
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · ada6e563
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      BitKeeper/deleted/.del-ctype-cp932.c:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.result:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      mysql-test/r/ctype_ujis.result:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-gbk.c:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      ada6e563
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my50 · ee3677d2
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50-ndb
      
      
      ee3677d2
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5dd49439
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.innolike
      
      
      5dd49439
    • unknown's avatar
      Clean up after merge of bug fixes · f03607ea
      unknown authored
      
      mysql-test/r/strict.result:
        Fix results file
      f03607ea
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11954 · fd8952b0
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      fd8952b0
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-5906 · baad44b9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      sql/field.cc:
        Auto merged
      mysql-test/r/strict.result:
        Resolve conflict
      mysql-test/t/strict.test:
        Resolve conflict
      baad44b9
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11822 · 8e845dba
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/sql_parse.cc:
        Auto merged
      8e845dba
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 53e59866
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      53e59866
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 038631da
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11760
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      038631da
    • unknown's avatar
      Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned · c816f297
      unknown authored
      by subtime() in view
      
      Item_func_add_time::print() were printing arg[0] instead of arg[1] which
      results in wrongly created view. Functions addtime() and subtime were
      affected by this bug.
      
      
      sql/item_timefunc.cc:
        Fix bug #11760 Typo in Item_func_add_time::print() results in wrongly created view
      mysql-test/t/view.test:
        Test case for bug #11760  Typo in Item_func_add_time::print() results in wrongly created view
      mysql-test/r/view.result:
        Test case for bug #11760  Typo in Item_func_add_time::print() results in wrongly created view
      mysql-test/r/date_formats.result:
        Fixed wrong test result. Affected by bug#11760
      c816f297
  3. 19 Jul, 2005 15 commits
    • unknown's avatar
      Cleanups after merge from 4.1. · ccc3052d
      unknown authored
      
      mysql-test/r/ps_1general.result:
        Update results
      mysql-test/r/ps_2myisam.result:
        Update results
      mysql-test/r/ps_3innodb.result:
        Update results
      mysql-test/r/ps_4heap.result:
        Update results
      mysql-test/r/ps_5merge.result:
        Update results
      mysql-test/r/ps_6bdb.result:
        Update results
      mysql-test/r/ps_7ndb.result:
        Update results
      mysql-test/r/select.result:
        Update results
      mysql-test/t/disabled.def:
        Disable ndb_condition_pushdown test
      mysql-test/t/select.test:
        Fix bad merge
      sql/field_conv.cc:
        Update name of warning message
      sql/mysqld.cc:
        Set proper thd->killed
      tests/mysql_client_test.c:
        Update test cases, change verify_prepared_field() help function
        so it is passed the filename and line from where it is called
        and includes that in the error message.
      ccc3052d
    • unknown's avatar
      Fix a compilation failure. · 9142113c
      unknown authored
      9142113c
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my50 · a4f7d138
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50-ndb
      
      
      a4f7d138
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 29654f69
      unknown authored
      into  mysql.com:/data0/emurphy/src/mysql-5.0
      
      
      29654f69
    • unknown's avatar
      ha_ndbcluster.cc: · 217f9fa1
      unknown authored
        BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
      
      
      sql/ha_ndbcluster.cc:
        BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
      217f9fa1
    • unknown's avatar
      Ignore mysql-test/var (I'm pushing it for the second time already :(() · a29f6ca1
      unknown authored
      
      BitKeeper/etc/ignore:
        added mysql-test/var
      a29f6ca1
    • unknown's avatar
      .del-var~62c955ccf2da1a21: · dbec94d1
      unknown authored
        Delete: mysql-test/var
      
      
      BitKeeper/deleted/.del-var~62c955ccf2da1a21:
        Delete: mysql-test/var
      dbec94d1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cd4bce02
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new
      
      
      sql/handler.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      cd4bce02
    • unknown's avatar
      A fix and a test case for Bug#10760 and complementary cleanups. · de6f5ae5
      unknown authored
      The idea of the patch
      is that every cursor gets its own lock id for table level locking.
      Thus cursors are protected from updates performed within the same 
      connection. Additionally a list of transient (must be closed at
      commit) cursors is maintained and all transient cursors are closed
      when necessary. Lastly, this patch adds support for deadlock
      timeouts to TLL locking when using cursors.
      + post-review fixes.
      
      
      include/thr_lock.h:
        - add a notion of lock owner to table level locking. When using
          cursors, lock owner can not be identified by a thread id any more, 
          as we must protect cursors from updates issued within the same 
          connection (thread). So, each cursor has its own lock identifier to 
          use with table level locking.
        - extend return values of thr_lock and thr_multi_lock with
          THR_LOCK_TIMEOUT and THR_LOCK_DEADLOCK, since these conditions
          are now possible (see comments to thr_lock.c)
      mysys/thr_lock.c:
        Better support for cursors:
        - use THR_LOCK_OWNER * as lock identifier, not pthread_t.
        - check and return an error for a trivial deadlock case, when an
          update statement is issued to a table locked by a cursor which has 
          been previously opened in the same connection.
        - add support for locking timeouts: with use of cursors, trivial 
          deadlocks can occur. For now the only remedy is the lock wait timeout,
          which is initialized from a new global variable 'table_lock_wait_timeout'
          Example of a deadlock (assuming the storage engine does not downgrade 
          locks):
          con1: open cursor for select * from t1;
          con2: open cursor for select * from t2;
          con1: update t2 set id=id*2;  -- blocked
          con2: update t1 set id=id*2;  -- deadlock
          Lock timeouts are active only if a connection is using cursors.
        - the check in the wait_for_lock loop has been changed from
          data->cond != cond to data->cond != 0. data->cond is zeroed
          in every place it's changed. 
        - added comments
      sql/examples/ha_archive.cc:
        - extend the handlerton with the info about cursor behaviour at commit.
      sql/examples/ha_archive.h:
        - ctor moved to .cc to make use of archive handlerton
      sql/examples/ha_example.cc:
        - add handlerton instance, init handler::ht with it
      sql/examples/ha_example.h:
        - ctor moved to .cc to make use of ha_example handlerton
      sql/examples/ha_tina.cc:
        - add handlerton instance, init handler::ht with it
      sql/examples/ha_tina.h:
        - ctor moved to .cc to make use of CSV handlerton
      sql/ha_berkeley.cc:
        - init handlerton::flags and handler::ht
      sql/ha_berkeley.h:
        - ctor moved to .cc to make use of BerkeleyDB handlerton
      sql/ha_blackhole.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_blackhole.h:
        - ctor moved to .cc to make use of blackhole handlerton
      sql/ha_federated.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_federated.h:
        - ctor moved to .cc to make use of federated handlerton
      sql/ha_heap.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_heap.h:
        - ctor moved to .cc to make use of ha_heap handlerton
      sql/ha_innodb.cc:
        - init handlerton::flags and handler::ht of innobase storage engine
      sql/ha_innodb.h:
        - ctor moved to .cc to make use of archive handlerton
      sql/ha_myisam.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_myisam.h:
        - ctor moved to .cc to make use of MyISAM handlerton
      sql/ha_myisammrg.cc:
        - init handler::ht in the ctor
      sql/ha_myisammrg.h:
        - ctor moved to .cc to make use of MyISAM MERGE handlerton
      sql/ha_ndbcluster.cc:
        - init handlerton::flags and handler::ht
      sql/handler.cc:
        - drop support for ISAM storage engine, which was removed from 5.0
        - close all "transient" cursors at COMMIT/ROLLBACK. A "transient"
          SQL level cursor is a cursor that uses tables that have a transaction-
          specific state.
      sql/handler.h:
        - extend struct handlerton with flags, add handlerton *ht to every
          handler instance.
      sql/lock.cc:
        - extend mysql_lock_tables to send error to the client if 
          thr_multi_lock returns a timeout or a deadlock error.
      sql/mysqld.cc:
        - add server option --table_lock_wait_timeout (in seconds)
      sql/set_var.cc:
        - add new global variable 'table_lock_wait_timeout' to specify
        a wait timeout for table-level locks of MySQL (in seconds). The default
        timeout is 50 seconds. The timeout is active only if the connection
        has open cursors.
      sql/sql_class.cc:
        - implement Statement_map::close_transient_cursors
        - safety suggests that we need an assert ensuring 
         llock_info->n_cursors is functioning properly, adjust destruction of
         the Statement_map to allow such assert in THD::~THD
      sql/sql_class.h:
        - add support for Cursors registry to Statement map.
      sql/sql_prepare.cc:
        - maintain a list of cursors that must be closed at commit/rollback.
      sql/sql_select.cc:
        - extend class Cursor to support specific at-COMMIT/ROLLBACK behavior.
        If a cursor uses tables of a storage engine that 
        invalidates all open tables at COMMIT/ROLLBACK, it must be closed
        before COMMIT/ROLLBACK is executed.
      sql/sql_select.h:
        - add an own lock_id and commit/rollback status flag to class Cursor
      tests/mysql_client_test.c:
        A test case for Bug#10760 and complementary issues: test a simple
        deadlock case too.
      mysql-test/var:
        New BitKeeper file ``mysql-test/var''
      de6f5ae5
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · e9c64ae2
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      extra/perror.c:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/main.cpp:
        Auto merged
      sql/des_key_file.cc:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/select.test:
        Resolve conflicts
      scripts/mysqld_safe.sh:
        Resolve conflict
      sql/item.cc:
        Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
        can be longer in 5.0 than 4.1.
      sql/log_event.cc:
        Resolve conflict
      sql/mysql_priv.h:
        Resolve conflict
      sql/mysqld.cc:
        Remove incorrect fix (merge from 4.1)
      sql/sql_show.cc:
        Resolve conflict
      e9c64ae2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 18552058
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-tn
      
      
      18552058
    • unknown's avatar
      After merge fix. · cbe7fdc9
      unknown authored
      cbe7fdc9
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-7249 · abcd8b03
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      abcd8b03
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a160bc9c
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-tn
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/errmsg.txt:
        Manual merge.
      a160bc9c
    • unknown's avatar
      Fixed some test cases that was not forgotten in a recent patch · 3d5be633
      unknown authored
      
      sql/sql_show.cc:
        Cleanup comment
        Removed extra end space
      3d5be633