1. 24 Oct, 2006 8 commits
  2. 23 Oct, 2006 2 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/w3475/my41-w3475 · bda4032f
      unknown authored
      into  mysql.com:/home/hf/work/w3475/my50-w3475
      
      
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/lock_multi.test:
        Auto merged
      mysql-test/t/rename.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/status.test:
        Auto merged
      client/mysqltest.c:
        merging
      libmysql/libmysql.c:
        merging
      bda4032f
    • unknown's avatar
      WL#3475 (Threads for the embedded server in mysqltest) · 4ddb48c6
      unknown authored
      Necessary code added to mysqltest.c.
      Disabled tests are available now.
      
      
      client/mysqltest.c:
        do_send_query function implemented, so now 'send' command will be
        run in separate thread for the embedded server.
        Mutex and condition added to the 'connection' struct for syncronisation
        purposes. Yes it'd be easier if we had pthread_join() command
      libmysql/libmysql.c:
        this isn't actually needed and causes problems in embedded server
      mysql-test/t/bdb-deadlock.test:
        test is available for the embedded server now
      mysql-test/t/flush.test:
        test is available for the embedded server now
      mysql-test/t/flush_block_commit.test:
        test is available for the embedded server now
      mysql-test/t/innodb-deadlock.test:
        test is available for the embedded server now
      mysql-test/t/innodb-lock.test:
        test is available for the embedded server now
      mysql-test/t/lock_multi.test:
        test is available for the embedded server now
      mysql-test/t/rename.test:
        test is available for the embedded server now
      mysql-test/t/show_check.test:
        test is available for the embedded server now
      mysql-test/t/status.test:
        test is available for the embedded server now
      4ddb48c6
  3. 20 Oct, 2006 7 commits
  4. 19 Oct, 2006 12 commits
  5. 18 Oct, 2006 2 commits
    • unknown's avatar
      Merge mysql.com:/data0/bk/mysql-5.0 · ea39ca34
      unknown authored
      into  mysql.com:/data0/bk/mysql-5.0-kt
      
      
      ea39ca34
    • unknown's avatar
      BUG#23175 - MYISAM crash/repair failed during repair · 48cf65c0
      unknown authored
      Repair table could crash a server if there is not sufficient
      memory (myisam_sort_buffer_size) to operate. Affects not only
      repair, but also all statements that use create index by sort:
      repair by sort, parallel repair, bulk insert.
      
      Return an error if there is not sufficient memory to store at
      least one key per BUFFPEK.
      
      Also fixed memory leak if thr_find_all_keys returns an error.
      
      
      myisam/sort.c:
        maxbuffer is number of BUFFPEK-s for repair. It is calculated
        as records / keys. keys is number of keys that can be stored
        in memory (myisam_sort_buffer_size). There must be sufficient
        memory to store both BUFFPEK-s and keys. It was checked
        correctly before this patch. However there is another
        requirement that wasn't checked: there must be sufficient
        memory for at least one key per BUFFPEK, otherwise repair
        by sort/parallel repair cannot operate.
        
        Return an error if there is not sufficient memory to store at
        least one key per BUFFPEK.
        
        Also fixed memory leak if thr_find_all_keys returns an error.
      mysql-test/r/repair.result:
        A test case for BUG#23175.
      mysql-test/t/repair.test:
        A test case for BUG#23175.
      48cf65c0
  6. 17 Oct, 2006 9 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b18b419b
      unknown authored
      into  sunlight.local:/local_work/14959-bug-5.0-opt-mysql
      
      
      b18b419b
    • unknown's avatar
      sql_rename.cc: · 3dccef3c
      unknown authored
        Cleanup of fix for bug#14959.
      
      
      sql/sql_rename.cc:
        Cleanup of fix for bug#14959.
      3dccef3c
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e2698fa7
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0-opt
      
      
      sql/sql_select.cc:
        Auto merged
      e2698fa7
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0-opt · 711021a4
      unknown authored
      into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug19579
      
      
      mysql-test/t/select.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/select.result:
        SCCS merged
      711021a4
    • unknown's avatar
      71b67e4a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · c208f46b
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B21798-5.0-opt-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/subselect.result:
        merge fixes for bug 21798
      mysql-test/t/subselect.test:
        merge fixes for bug 21798
      c208f46b
    • unknown's avatar
      Bug#21798: memory leak during query execution with subquery in column · 841ea461
      unknown authored
                  list using a function
      When executing dependent subqueries they are re-inited and re-exec() for 
      each row of the outer context.
      The cause for the bug is that during subquery reinitialization/re-execution,
      the optimizer reallocates JOIN::join_tab, JOIN::table in make_simple_join()
      and the local variable in 'sortorder' in create_sort_index(), which is
      allocated by make_unireg_sortorder().
      Care must be taken not to allocate anything into the thread's memory pool
      while re-initializing query plan structures between subquery re-executions.
      All such items mush be cached and reused because the thread's memory pool
      is freed at the end of the whole query.
      Note that they must be cached and reused even for queries that are not 
      otherwise cacheable because otherwise it will grow the thread's memory 
      pool every time a cacheable query is re-executed. 
      We provide additional members to the JOIN structure to store references 
      to the items that need to be cached.
      
      
      mysql-test/r/subselect.result:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - test case
      mysql-test/t/subselect.test:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - test case
      sql/mysql_priv.h:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - cache the entities allocated in the threads memory pool by
           JOIN::exec ().
      sql/sql_delete.cc:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - cache the SORT_ORDER, TABLE * and JOIN_TAB allocated in the thread's 
           memory pool by JOIN::exec ().
      sql/sql_select.cc:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - cache the SORT_ORDER, TABLE * and JOIN_TAB allocated in the thread's 
           memory pool by JOIN::exec ().
      sql/sql_select.h:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - cache the SORT_ORDER, TABLE * and JOIN_TAB allocated in the thread's 
           memory pool by JOIN::exec ().
      sql/sql_table.cc:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - cache the SORT_ORDER, TABLE * and JOIN_TAB allocated in the thread's 
           memory pool by JOIN::exec ().
      sql/sql_update.cc:
        Bug#21798: memory leak during query execution with subquery in column
                    list using a function
         - cache the SORT_ORDER, TABLE * and JOIN_TAB allocated in the thread's 
           memory pool by JOIN::exec ().
      841ea461
    • unknown's avatar
      merge changes becuase of the fix for bug 22367 · d2198ed9
      unknown authored
      d2198ed9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · a2e0c419
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B22367-5.0-opt-merge
      
      
      include/my_base.h:
        Auto merged
      mysql-test/r/select.result:
        merge of 5.0-opt to 22367
      mysql-test/t/select.test:
        merge of 5.0-opt to 22367
      a2e0c419