1. 05 Dec, 2008 8 commits
    • Guilhem Bichot's avatar
      merge with latest 5.1-maria · ccfb9c32
      Guilhem Bichot authored
      ccfb9c32
    • Guilhem Bichot's avatar
      Fix for BUG#41037 "Maria: recovery failure (pushbuild2)" (checkpoint bug). · 91bc9cc9
      Guilhem Bichot authored
      mysql-test/suite/maria/r/maria-recovery3.result:
        result.
      mysql-test/suite/maria/t/maria-recovery3-master.opt:
        usual recovery test options
      mysql-test/suite/maria/t/maria-recovery3.test:
        Test for BUG#41037. Without the bugfix, the test would hang because Recovery would fail with "undo_key_insert got error 126": Recovery would believe INSERT of 2 is uncommitted, try to execute its UNDO_KEY_INSERT, fail to find the key to delete because DELETE deleted it. That failure of _ma_ck_real_delete() would mark table as corrupted (see
        in d_search()) which is error 126 (HA_ERR_CRASHED).
      storage/maria/ma_blockrec.c:
        set trn->rec_lsn to LSN of commit record, when writing it.
      storage/maria/ma_blockrec.h:
        new function
      storage/maria/ma_commit.c:
        when committing or rolling back, rec_lsn should be LSN_IMPOSSIBLE: assertion is moved here
        from trnman_end_trn(), because now ma_commit() can set rec_lsn and so when we reach trnman_end_trn()
        it's not LSN_IMPOSSIBLE anymore.
        Adding debug possibility to pause between COMMIT record write and trnman_commit_trn(), to be
        able to fire checkpoint in between.
      storage/maria/ma_loghandler.c:
        in-write hook for COMMIT records
      storage/maria/ma_recovery.c:
        More debugging info in maria_recovery.trace, to see how the starting point of REDO phase is determined
      storage/maria/trnman.c:
        assertion cannot be here anymore see ma_commit.c
      91bc9cc9
    • Sergei Golubchik's avatar
      compilation warnings · 633eabc6
      Sergei Golubchik authored
      633eabc6
    • Guilhem Bichot's avatar
      Fix for BUG#41102 "Maria: maria-no-logging.test fails randomly on Win64" · 44d3917f
      Guilhem Bichot authored
      mysql-test/include/maria_empty_logs.inc:
        move mysqladmin call to include file for reusal (so that others don't have to hit the same bug in their tests);
        this include file additionally waits for disconnection. Reasons for BUG#41102:
        - in maria-no-logging.test, we shut down mysqld in maria_empty_logs.inc, remove logs, tell mtr that it can
        restart mysqld, then wait for being connected (wait_until_connected_again.inc), then send commands to new mysqld.
        - but under Windows "mysqladmin shutdown" does not wait for mysqld to be down, so we accidentally removed logs
        while it was shutting down, wait_until_connected_again found that we were connected (because it was shutting
        down slowly, connections were not yet broken), sent new commands, and one of them failed because mysqld finally
        closed connections.
        - the fix is to just wait for disconnection after shutdown.
        - in a sense, the catch is the "again" in wait_until_connected_again.inc...
      mysql-test/include/mysqladmin_shutdown.inc:
        shutdown with mysqladmin AND waiting for shutdown to complete (needed on Windows)
      mysql-test/include/wait_until_connected_again.inc:
        comment
      mysql-test/include/wait_until_disconnected.inc:
        script which waits until connection is lost
      44d3917f
    • Sergei Golubchik's avatar
      merged · d00d63dd
      Sergei Golubchik authored
      d00d63dd
    • Sergei Golubchik's avatar
      bug#41024 maria: Server crashes in sysbench OLTP_RW test at lf_hash.c:94 · c151d0cc
      Sergei Golubchik authored
      bug#41023 maria: Server asserts in sysbench OLTP_RO test 
      bug#40888 maria: Server crashes in sysbench OLTP_RW test at lf_alloc-pin.c:513
      bug#40892 maria: Livelock in sysbench OLTP_RW test 
      bug#40895 maria: Server crashes in sysbench OLTP_RO test at lf_alloc-pin.c:367
      bug#40890 maria: Server crashes in sysbench OLTP_RW test at ctype-bin.c:8
      
      Yet another strict aliasing issue
      c151d0cc
    • Sergei Golubchik's avatar
      bug#40416 - Maria: Memory allocated at trnman.c:129 was underrun. · f82866f5
      Sergei Golubchik authored
      we cannot access a trn after we put it in the pool
      f82866f5
    • Guilhem Bichot's avatar
      Fix for pushbuild failure (test which can't run in embedded mode) and compiler warning · 45521d97
      Guilhem Bichot authored
      mysql-test/suite/maria/t/maria_showlog_error.test:
        test which can't run in embedded mode
      storage/innobase/handler/ha_innodb.cc:
        compiler warning
      45521d97
  2. 04 Dec, 2008 2 commits
    • Guilhem Bichot's avatar
      Fixing Valgrind error: deadlock detector was set to random; seen in many... · fb945ef2
      Guilhem Bichot authored
      Fixing Valgrind error: deadlock detector was set to random; seen in many InnoDB tests like innodb-replace.test
      
      storage/innobase/handler/ha_innodb.cc:
        Fixing Valgrind error: deadlock detector was set to random. Making the recently added lines closer
        to the InnoDB style (tabs not spaces)
      fb945ef2
    • Michael Widenius's avatar
      Fixed warnings and errors discovered by pushbuild2 · d83f6470
      Michael Widenius authored
      mysys/my_init.c:
        Fixed link error when compiling without thread support
      sql/item_create.cc:
        Fixed compiler warning
      sql/mysqld.cc:
        Fixed compile error on windows
      sql/protocol.cc:
        Fixed compiler warning
      sql/sql_class.cc:
        Fixed compiler warning
      sql/sql_class.h:
        Fixed compiler warning
      storage/myisam/mi_open.c:
        Fixed compiler warning
      storage/myisammrg/ha_myisammrg.cc:
        Fixed compiler warning (shadow variable)
      d83f6470
  3. 03 Dec, 2008 1 commit
  4. 02 Dec, 2008 4 commits
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_deadlock_detector) · 32f81bab
      Michael Widenius authored
      This writes a warning on stderr if one uses mutex in different order,
      like if one in one case would lock mutex in the order A,B and in another case
      would lock mutex in the order B,A
      This is inspired by and loosely based on the LOCKDEP patch by Jonas
      Wrong mutex order is either fixed or mutex are marked with MYF_NO_DEADLOCK_DETECTION
      if used inconsistently (need to be fixed by server team)
      
      KNOWN_BUGS.txt:
        Added information that one need to dump and restore Maria tables
      include/hash.h:
        Added prototype function for walking over all elements in a hash
      include/my_pthread.h:
        Added my_pthread_mutex_init() and my_pthread_mutex_lock(); These should be used if one wants to disable mutex order checking.
        Changed names of the nonposix mutex_init functions to not conflict with my_phread_mutex_init()
        Added and extended structures for mutex deadlock detection.
        New arguments to sage_mutex_init() and safe_mutex_lock() to allow one to disable mutex order checking.
        Added variable 'safe_mutex_deadlock_detector' to enable/disable deadlock detection for all pthread_mutex_init()
      mysys/Makefile.am:
        Added cleaning of test files
        Added test_thr_mutex
      mysys/hash.c:
        Added hash_iterate() to iterate over all elements in a hash
        More comments
      mysys/my_init.c:
        Added calls to destory all mutex uses by mysys()
        Added waiting for threads to end before calling TERMINATE() to list not freed memory
      mysys/my_pthread.c:
        Changed names to free my_pthread_mutex_init() for mutex-lock-order-checking
      mysys/my_sleep.c:
        Fixed too long wait if using 1000000L as argument
      mysys/my_thr_init.c:
        Mark THR_LOCK_threads and THR_LOCK_malloc to not have mutex deadlock detection.
        (We can't have it enabled for this as these are internal mutex used by the detector  
        Call my_thread_init() early as we need thread specific variables enabled for the following pthread_mutex_init()
        Move code to wait for threads to end to my_wait_for_other_threads_to_die()
        Don't destroy mutex and conditions unless all threads have died
        Added my_thread_destroy_mutex() to destroy all mutex used by the mysys thread system
        Name the thread specific mutex as "mysys_var->mutex"
        Added my_thread_var_mutex_in_use() to return pointer to mutex in use or 0 if thread variables are not initialized
      mysys/mysys_priv.h:
        Added prototypes for functions used internally with mutex-wrong-usage detection
      mysys/thr_mutex.c:
        Added runtime detection of mutex used in conflicting order
        See WL#3262 or test_thr_mutex.c for examples
        The base idea is for each mutex have two hashes:
        - mutex->locked_mutex points to all mutex used after this one
        - mutex->used_mutex points to all mutex which has this mutex in it's mutex->locked_mutex
        There is a wrong mutex order if any mutex currently locked before this mutex is in the mutex->locked_mutex hash
      sql/event_queue.cc:
        Mark mutex used inconsistently (need to be fixed by server team)
      sql/event_scheduler.cc:
        Declare the right order to take the mutex
      sql/events.cc:
        Mark mutex used inconsistently (need to be fixed by server team)
      sql/ha_ndbcluster_binlog.cc:
        Mark mutex used inconsistently (need to be fixed by server team)
      sql/log.cc:
        Mark mutex used inconsistently (need to be fixed by server team)
      sql/mysqld.cc:
        Use pthread_mutex_trylock instead of pthread_mutex_unlock() when sending kill signal to thread
        This is needed to avoid wrong mutex order as normally one takes 'current_mutex' before mysys_var->mutex.
        Added call to free sp cache.
        Add destruction of LOCK_server_started and COND_server_started.
        Added register_mutex_order() function to register in which order mutex should be taken
        (to initiailize mutex_deadlock_detector).
        Added option to turn off safe_mutex_deadlock_detector
      sql/protocol.cc:
        Fixed wrong argument to DBUG_PRINT (found by valgrind)
      sql/rpl_mi.cc:
        Mark mutex used inconsistently (need to be fixed by server team)
      sql/set_var.cc:
        Remove wrong locking of LOCK_global_system_variables when reading and setting log variables
        (would cause inconsistent mutex order).
        Update global variables outside of logger.unlock() as LOCK_global_system_variables has to be taken before logger locks
        Reviewed by gluh
      sql/sp_cache.cc:
        Added function to destroy mutex used by sp cache
      sql/sp_cache.h:
        Added function to destroy mutex used by sp cache
      sql/sql_class.cc:
        Use pthread_mutex_trylock instead of pthread_mutex_unlock() when sending kill signal to thread
        This is needed to avoid wrong mutex order as normally one takes 'current_mutex' before mysys_var->mutex.
        Register order in which LOCK_delete and mysys_var->mutex is taken
      sql/sql_insert.cc:
        Give a name for Delayed_insert::mutex
        Mark mutex used inconsistently (need to be fixed by server team)
        Move closing of tables outside of di->mutex (to avoid wrong mutex order)
      sql/sql_show.cc:
        Don't keep LOCK_global_system_variables locked over value->show_type() as this leads to wrong mutex order
      storage/innobase/handler/ha_innodb.cc:
        Disable safe_muted_deadlock_detector for innobase intern mutex (to speed up page cache initialization)
      storage/maria/ha_maria.cc:
        Added flag to ha_maria::info() to signal if we need to lock table share or not.
        This is needed to avoid locking mutex in wrong order
      storage/maria/ha_maria.h:
        Added flag to ha_maria::info() to signal if we need to lock table share or not.
      storage/maria/ma_close.c:
        Destroy key_del_lock
        Simplify freeing ftparser_param
      storage/maria/ma_key.c:
        Better comment
      storage/maria/ma_loghandler.c:
        Mark mutex used inconsistently (need to be fixed by sanja)
      storage/maria/ma_state.c:
        More comments
      storage/maria/ma_test1.c:
        Ensure that safe_mutex_deadlock_detector is always on (should be, this is just for safety)
      storage/maria/ma_test2.c:
        Ensure that safe_mutex_deadlock_detector is always on (should be, this is just for safety)
      32f81bab
    • Michael Widenius's avatar
      Remove not used signal handling for ending a thread · a6b67c50
      Michael Widenius authored
      Ensure that if we send 'sigint' to mysqld started with --gdb it's taken down nicely
      Clear THR_THD when thread ends to get a valid stack trace if we die late
      Bug #37869 mysqld stopped reacting to SIGINT when run with --gdb
      
      
      a6b67c50
    • Sergei Golubchik's avatar
      dbug fix: only do safemalloc checks if a function is selected · 7881dc1f
      Sergei Golubchik authored
      mysqlslap: fix a crash when mysql_store_result() fails
      
      client/mysqlslap.c:
        fix a crash
      dbug/dbug.c:
        only do safemalloc checks if a function is selected
      mysql-test/mysql-test-run.pl:
        it's easier to add new gdb parameters this way
      storage/maria/ma_open.c:
        typo in a comment
      7881dc1f
  5. 01 Dec, 2008 1 commit
    • unknown's avatar
      Do not use MY_WME in the stat call which errors we process on high level. · 2b511502
      unknown authored
      (BUG#41127: Maria: assertion when SHOW ENGINE MARIA LOGS and missing logs)
      
      mysql-test/suite/maria/r/maria_showlog_error.result:
        test suite for the BUG#41127
      mysql-test/suite/maria/t/maria_showlog_error.test:
        test suite for the BUG#41127
      storage/maria/ha_maria.cc:
        Do not use MY_WME in the stat call which errors we process on high level.
      2b511502
  6. 28 Nov, 2008 1 commit
    • Sergei Golubchik's avatar
      Bug#34374: mysql generates incorrect warning · f1906c62
      Sergei Golubchik authored
      an item was evaluated unnecessary, fix that by checking preconditions before evaluating the item
      
      sql/sql_select.cc:
        an item was evaluated unnecessary, fix that by checking preconditions before evaluating the item
      f1906c62
  7. 27 Nov, 2008 1 commit
    • Guilhem Bichot's avatar
      Fix for BUG#40661 "Maria: crash in embedded server (when detecting deadlock?)" · 255f8feb
      Guilhem Bichot authored
      bug is actually a weirdness in test system, so moving test portion into maria_notembedded.test
      
      mysql-test/suite/maria/r/maria.result:
        result update
      mysql-test/suite/maria/r/maria_notembedded.result:
        result update
      mysql-test/suite/maria/t/maria.test:
            Removing test portion into maria_notembedded.test. Explanation below.
            Running maria.test with --mem --embedded --valgrind I got:
            ==378== Invalid read of size 4
            ==378==    at 0x857C755: _lf_pinbox_real_free (lf_alloc-pin.c:342)
            ==378==    by 0x857C640: _lf_pinbox_free (lf_alloc-pin.c:267)
            ==378==    by 0x857D50C: ldelete (lf_hash.c:226)
            ==378==    by 0x857DBC1: lf_hash_delete (lf_hash.c:429)
            ==378==    by 0x8243D82: unlock_lock_and_free_resource
            (waiting_threads.c:676)
            ==378==    by 0x8244A79: wt_thd_release (waiting_threads.c:948)
            ==378==    by 0x83F301D: wt_thd_release_self (trnman.c:98)
            ==378==    by 0x83F3D49: trnman_end_trn (trnman.c:431)
            ==378==    by 0x837C437: ma_commit (ma_commit.c:60)
            ==378==    by 0x835F082: ha_maria::external_lock(THD*, int)
            (ha_maria.cc:2387)
            ==378==    by 0x84D1011: handler::ha_external_lock(THD*, int)
            (handler.cc:4433)
            ==378==    by 0x856DA92: unlock_external(THD*, st_table**, unsigned)
            (lock.cc:786)
            ==378==    by 0x856DD6F: mysql_unlock_tables(THD*, st_mysql_lock*)
            (lock.cc:389)
            ==378==    by 0x8274A57: close_thread_tables(THD*) (sql_base.cc:1307)
            ==378==    by 0x82ABEC3: unlock_locked_tables(THD*) (sql_parse.cc:99)
            ==378==    by 0x82B0BB3: mysql_execute_command(THD*)
            (sql_parse.cc:3372)
            ==378==  Address 0x5894a0c is 164 bytes inside a block of size 184
            free'd
            ==378==    at 0x40233FC: free (vg_replace_malloc.c:323)
            ==378==    by 0x823CF92: my_thread_end (my_thr_init.c:348)
            ==378==    by 0x8200FEE: mysql_thread_end (libmysql.c:250)
            ==378==    by 0x81A9487: send_one_query (mysqltest.c:535)
            ==378==    by 0x4050111: start_thread (in /lib/libpthread-2.5.so)
            ==378==    by 0x41A52ED: clone (in /lib/libc-2.5.so)
            
            (among other errors). The line where the invalid read happens is:
              if (available_stack_size(&pinbox, *pins->stack_ends_here) >
            alloca_size)
            and stack_ends_here was previously set here:
              el->stack_ends_here= & my_thread_var->stack_ends_here;
            The mysqltest "send" command, in embedded mode, is implemented this way
            (mysqltest.c:do_send_query()): a *new OS thread* is created in
            mysqltest, and does this:
            
              mysql_thread_init();
              VOID(mysql_send_query(&cn->mysql, cn->cur_query,
            cn->cur_query_len));
              mysql_thread_end();
            
            So, con_d "send insert t1 values (2)" creates a new OS thread, which
            gets a thread-specific data (mysql_thread_init()), then sends the
            query; in particular, this sets el->stack_ends_here to a pointer inside
            the thread-specific data (see my_thread_var above), that is, thd->pins
            depends on the thread-specific data.
            This sent "insert" blocks as expected, thread-specific data is free()d
            (my_thread_end() above), OS thread terminates.
            Then "default" connection runs "insert t1 values (3)"
            which blocks on the 3 already inserted by the con_d.
            This blocking (see waiting_threads.c) creates a WT_RESOURCE, which has,
            as owner, con_d's WT_THD.
            When con_d calls "unlock tables" (see stack trace), it wants to release
            this resource, which involves con_d's thd->pins, so it ends up reading
            stack_ends_here which points inside the freed thread-specific data =>
            Valgrind error, crashes...
            So this is an effect of having one single connection (con_d) for which
            two queries:
            send insert t1 values (2)
            unlock tables
            are done by different OS threads. That is indeed weird design of
            mysqltest, and it breaks on the dependency of lf_alloc-pin.c on
            thread-specific data. It is maybe already explained in those comments
            in lf_alloc-pin.c:
            "  It is assumed that pins belong to a THD and are not transferable
              between THD's (LF_PINS::stack_ends_here being a primary reason
              for this limitation)."
            "    It is assumed that pins belong to a thread and are not
            transferable
                between threads."
            
            In correct usage of libmysqld (no two queries sent for one connection
            by two threads), this problem would not happen, so I call it a
            deficiency of the test system.
      mysql-test/suite/maria/t/maria_notembedded.test:
        moving test portion into maria_notembedded.test
      255f8feb
  8. 25 Nov, 2008 2 commits
    • unknown's avatar
      Fix of the small merge bug. · bb7ae40a
      unknown authored
      bb7ae40a
    • Guilhem Bichot's avatar
      Manually applying the patch for BUG40954 "Crash in MyISAM index code with... · 3c1e153a
      Guilhem Bichot authored
      Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
      so that it stops crashing pushbuild2/5.1-maria and we can see the other failures which it hid.
      
      mysql-test/r/partition.result:
        Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
      mysql-test/t/partition.test:
        Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
      sql/ha_partition.cc:
        Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
      3c1e153a
  9. 24 Nov, 2008 5 commits
  10. 22 Nov, 2008 1 commit
  11. 21 Nov, 2008 1 commit
  12. 20 Nov, 2008 1 commit
    • Guilhem Bichot's avatar
      During Maria's checkpoint, use the proper mutex to read transaction's short_id · 8d96bcda
      Guilhem Bichot authored
      storage/maria/trnman.c:
        During Maria's checkpoint, we walk the list of active transactions; in this list we may find a transaction with a short_id of 0 which means "uninitialized" (is being created right now) and want to ignore this transaction. Such short_id is set under trn->state_lock, so use this mutex to reliably read short_id during checkpoint.
      8d96bcda
  13. 12 Nov, 2008 2 commits
  14. 11 Nov, 2008 1 commit
  15. 10 Nov, 2008 3 commits
  16. 07 Nov, 2008 4 commits
  17. 06 Nov, 2008 2 commits