1. 07 Apr, 2010 7 commits
  2. 06 Apr, 2010 5 commits
  3. 31 Mar, 2010 4 commits
    • mmakela's avatar
      branches/zip: Merge revisions 6921:6924 from branches/5.1: · 0e472197
      mmakela authored
        ------------------------------------------------------------------------
        r6924 | mmakela | 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) | 1 line
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug51920.test
      
        branches/5.1: innodb_bug51920.test: Fix a race condition.
        ------------------------------------------------------------------------
      0e472197
    • mmakela's avatar
      branches/zip: Merge revisions 6918:6921 from branches/5.1: · bdbd9cff
      mmakela authored
        ------------------------------------------------------------------------
        r6921 | mmakela | 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) | 2 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug51920.result
           M /branches/5.1/mysql-test/innodb_bug51920.test
      
        branches/5.1: innodb_bug51920.test: Make the test quicker and more
        deterministic.  Suggested by Vasil Dimov.
        ------------------------------------------------------------------------
      bdbd9cff
    • mmakela's avatar
    • mmakela's avatar
      branches/zip: Merge revisions 6788:6918 from branches/5.1: · 2535b068
      mmakela authored
        ------------------------------------------------------------------------
        r6822 | vasil | 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) | 12 lines
        Changed paths:
           M /branches/5.1/row/row0sel.c
      
        branches/5.1:
      
        Typecast to silence a compiler warning:
      
        row/row0sel.c: 4548
                C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data
        row/row0sel.c: 4553
                C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data
      
        Reported by:	Jonas Oreland <Jonas.Oreland@Sun.COM>
        Discussed with:	Sunny Bains <sunny.bains@oracle.com>
        ------------------------------------------------------------------------
        r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug38231.test
      
        branches/5.1:
      
        Fix a non-determinism in innodb_bug38231.
      
        Reported by:	Sergey Vojtovich <svoj@Sun.COM>
        ------------------------------------------------------------------------
        r6911 | vdimov | 2010-03-30 11:39:02 +0300 (Tue, 30 Mar 2010) | 2 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
      
        branches/5.1: Whitespace fixup
        ------------------------------------------------------------------------
        r6912 | vdimov | 2010-03-30 12:18:46 +0300 (Tue, 30 Mar 2010) | 2 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
      
        branches/5.1: Whitespace fixup on line 354
        ------------------------------------------------------------------------
        r6918 | mmakela | 2010-03-31 11:14:51 +0300 (Wed, 31 Mar 2010) | 6 lines
        Changed paths:
           A /branches/5.1/mysql-test/innodb_bug51920.result
           A /branches/5.1/mysql-test/innodb_bug51920.test
           M /branches/5.1/srv/srv0srv.c
      
        branches/5.1: Obey KILL during a lock wait (Bug #51920).
      
        srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread():
        Check trx_is_interrupted() in addition to checking the lock wait timeout.
      
        rb://279 approved by Sunny Bains
        ------------------------------------------------------------------------
      2535b068
  4. 29 Mar, 2010 2 commits
  5. 26 Mar, 2010 1 commit
    • vdimov's avatar
      Non-functional change: update copyright year to 2010 of the files · 6f8ba745
      vdimov authored
      that have been modified after 2010-01-01 according to svn.
      
      for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^   M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
      6f8ba745
  6. 25 Mar, 2010 6 commits
  7. 24 Mar, 2010 1 commit
  8. 23 Mar, 2010 4 commits
    • vdimov's avatar
      branches/zip: · 9c3351d5
      vdimov authored
      Merge joerg@mysql.com-20100322150231-vdq0afbqtmbs6phy from BZR,
      
      Including univ.i before mysql/plugin.h is needed to avoid this
      compiler error:
      
      o  This is how gcc puts it:
      o  > > ccache /usr/local/gcc-4.3.2/bin/gcc -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib    -g -O3 -march=i686   -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' || echo './'`trx/trx0i_s.c
      o  > > In file included from ./include/univ.i:114,
      o  > >                  from trx/trx0i_s.c:36:
      o  > > ../../include/my_pthread.h:628: error: expected ')' before '*' token
      o  > > In file included from ../../include/my_pthread.h:732,
      o  > >                  from ./include/univ.i:114,
      o  > >                  from trx/trx0i_s.c:36:
      o  > > ../../include/mysql/psi/mysql_thread.h:100: error: expected specifier-qualifier-list before 'pthread_rwlock_t'
      o  > > ../../include/mysql/psi/mysql_thread.h:116: error: expected specifier-qualifier-list before 'pthread_rwlock_t'
      o  > > ../../include/mysql/psi/mysql_thread.h: In function 'inline_mysql_rwlock_init':
      o  > > ../../include/mysql/psi/mysql_thread.h:711: error: 'mysql_rwlock_t' has no member named 'm_psi'
      o  > > ../../include/mysql/psi/mysql_thread.h:716: error: 'mysql_rwlock_t' has no member named 'm_rwlock'
      o  > > .... ((continued))
      o  
      o  Intel's icc gives slightly clearer messages:
      o  > > icc -static-intel -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib    -O3 -g -unroll2 -ip -mp -restrict -no-ftz -no-prefetch   -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' || echo './'`trx/trx0i_s.c
      o  > > ../../include/my_pthread.h(628): error: identifier "pthread_rwlock_t" is undefined
      o  > >   extern int rw_pr_init(rw_pr_lock_t *);
      o  > >                         ^
      o  > > 
      o  > > ../../include/mysql/psi/mysql_thread.h(100): error: identifier "pthread_rwlock_t" is undefined
      o  > >     rw_lock_t m_rwlock;
      o  > >     ^
      o  > > 
      o  > > ../../include/mysql/psi/mysql_thread.h(116): error: identifier "pthread_rwlock_t" is undefined
      o  > >     rw_pr_lock_t m_prlock;
      o  > >     ^
      9c3351d5
    • jyang's avatar
      branches/zip: This is patch from Inaam that uses red-black tree · 763d9625
      jyang authored
      to speed up insertions into the flush_list and thus the recovery
      process. The patch has been tested by Nokia.
      
      763d9625
    • mmakela's avatar
    • mmakela's avatar
  9. 22 Mar, 2010 1 commit
  10. 18 Mar, 2010 2 commits
  11. 17 Mar, 2010 1 commit
  12. 11 Mar, 2010 5 commits
  13. 10 Mar, 2010 1 commit
    • marko's avatar
      branches/zip: Merge revisions 6669:6788 from branches/5.1: · b8e0c522
      marko authored
        ------------------------------------------------------------------------
        r6774 | calvin | 2010-03-03 23:56:10 +0200 (Wed, 03 Mar 2010) | 2 lines
        Changed paths:
           M /branches/5.1/trx/trx0sys.c
      
        branches/5.1: fix bug#51653: outdated reference to set-variable
        Non functional change.
        ------------------------------------------------------------------------
        r6780 | vasil | 2010-03-08 19:13:20 +0200 (Mon, 08 Mar 2010) | 4 lines
        Changed paths:
           M /branches/5.1/plug.in
      
        branches/5.1:
      
        Whitespace fixup.
        ------------------------------------------------------------------------
        r6783 | jyang | 2010-03-09 17:54:14 +0200 (Tue, 09 Mar 2010) | 9 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/mysql-test/innodb_bug21704.result
           A /branches/5.1/mysql-test/innodb_bug47621.result
           A /branches/5.1/mysql-test/innodb_bug47621.test
      
        branches/5.1: Fix bug #47621 "MySQL and InnoDB data dictionaries
        will become out of sync when renaming columns". MySQL does not
        provide new column name information to storage engine to
        update the system table. To avoid column name mismatch, we shall
        just request a table copy for now.
      
        rb://246 approved by Marko.
        ------------------------------------------------------------------------
        r6785 | vasil | 2010-03-10 09:04:38 +0200 (Wed, 10 Mar 2010) | 11 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug38231.test
      
        branches/5.1:
      
        Add the missing --reap statements in innodb_bug38231.test. Probably MySQL
        enforced the presence of those recently and the test started failing like:
      
          main.innodb_bug38231                     [ fail ]
                  Test ended at 2010-03-10 08:48:32
      
          CURRENT_TEST: main.innodb_bug38231
          mysqltest: At line 49: Cannot run query on connection between send and reap
        ------------------------------------------------------------------------
        r6788 | vasil | 2010-03-10 10:53:21 +0200 (Wed, 10 Mar 2010) | 8 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug38231.test
      
        branches/5.1:
      
        In innodb_bug38231.test: replace the fragile sleep 0.2 that depends on timing
        with a more robust condition which waits for the TRUNCATE and LOCK commands
        to appear in information_schema.processlist. This could also break if there
        are other sessions executing the same SQL commands, but there are none during
        the execution of the mysql test.
        ------------------------------------------------------------------------
      b8e0c522