1. 10 Dec, 2009 1 commit
  2. 09 Dec, 2009 2 commits
  3. 08 Dec, 2009 3 commits
  4. 07 Dec, 2009 2 commits
    • Sergey Vojtovich's avatar
      WL#2511 - Add a new table to the Information Schema for TABLESPACE's · e8d01684
      Sergey Vojtovich authored
      Implemented a new INFORMATION_SCHEMA table, which is intended to
      provide information about tablespaces.
      
      mysql-test/r/information_schema.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/r/information_schema_db.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/r/mysqlshow.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      sql/handler.h:
        Added SCH_TABLESPACES to enum_schema_tables.
      sql/mysql_priv.h:
        Added human readable definitions for I_S.TABLESPACES field
        identifiers.
      sql/sql_show.cc:
        Added I_S.TABLESPACES schema. The code which handles I_S.FILES
        is capable to handle I_S.TABLESPACES as well. Thus we reuse
        this code and let functions/variables have more generic names.
      e8d01684
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · a8e80f31
      Alexander Nozdrin authored
      a8e80f31
  5. 05 Dec, 2009 1 commit
  6. 03 Dec, 2009 5 commits
    • V Narayanan's avatar
      Bug#40814 CSV engine does not parse \X characters when they occur in unquoted fields · a5aa3b3c
      V Narayanan authored
          
      When a .CSV file for table in the CSV engine contains
      \X characters as part of unquoted fields, e.g.
          
      2,naraya\nan
          
      \n is not interpreted as a new line (it is however interpreted as a
      newline in a quoted field).
          
      The old algorithm copied the entire value for a unquoted field without
      parsing the \X characters. 
          
      The new algorithm adds the capability to handle \X characters in the 
      unquoted fields of a .CSV file.
      
      mysql-test/r/csv.result:
        Bug#40814 CSV engine does not parse \X characters when they occur in unquoted fields
        
        Contains additional test output corresponding to the new 
        tests added.
      mysql-test/t/csv.test:
        Bug#40814 CSV engine does not parse \X characters when they occur in unquoted fields
        
        Contains additional tests for testing the behaviour of the CSV 
        storage engine when the fields are not enclosed in quotes and
        contain \X characters.
      storage/csv/ha_tina.cc:
        Bug#40814 CSV engine does not parse \X characters when they occur in unquoted fields
        
        Changes the parsing logic of the rows in a CSV file, to parse
        \X characters that might be present in the unquoted fields.
      a5aa3b3c
    • V Narayanan's avatar
      WL#4454 change sql_insert.cc::last_uniq_key to match keys in any order · 21aaf8dd
      V Narayanan authored
      Introduce a flag that will enable the REPLACE
      command to work correctly with an underlying
      storage engine that does not report unique key
      conflicts in the ascending order.
      
      sql/handler.h:
        WL#4454 change sql_insert.cc::last_uniq_key to match keys in any order
        
        Adds the flag that will be set by a
        SE that does not report unique key
        conflicts in the ascending order.
      sql/sql_insert.cc:
        WL#4454 change sql_insert.cc::last_uniq_key to match keys in any order
        
        modifies the function used for a last row
        replace optimization to check for the
        HA_DUPLICATE_KEY_NOT_IN_ORDER flag.
      21aaf8dd
    • Konstantin Osipov's avatar
      Merge next-mr -> next-mr-runtime · 94f25504
      Konstantin Osipov authored
      94f25504
    • V Narayanan's avatar
      WL#4448 Generalize the handlerton::fill_files_table call with handlerton::fill_is_table · e86daf9b
      V Narayanan authored
      The attached patch adds a method
      handlerton::fill_is_table that can be used
      instead of having to create specific
      handlerton::fill_*_table methods.
      
      sql/ha_ndbcluster.cc:
        WL#4448 Generalize the handlerton::fill_files_table call with handlerton::fill_is_table
        
        Implemented the method ndbcluster_fill_is_table
        that uses the supplied table id to switch to the
        appropriate fill_*_table method.
      sql/handler.h:
        WL#4448 Generalize the handlerton::fill_files_table call with handlerton::fill_is_table
        
        Moved the enum_schema_table enumeration
        from table.h to here. 
        
        contains the declaration for the new method
        fill_is_tables.
      sql/sql_show.cc:
        WL#4448 Generalize the handlerton::fill_files_table call with handlerton::fill_is_table
        
        calls the fill_is_table method instead of the
        fill_files_table method.
      sql/table.h:
        WL#4448 Generalize the handlerton::fill_files_table call with handlerton::fill_is_table
        
        removed the earlier definition of enum_schema_tables.
      e86daf9b
    • Marc Alff's avatar
      560e76c5
  7. 02 Dec, 2009 2 commits
  8. 01 Dec, 2009 3 commits
    • Andrei Elkin's avatar
      Manual resolving for the following files · 0eda4846
      Andrei Elkin authored
      Text conflict in mysql-test/collections/default.experimental
      Text conflict in mysql-test/r/show_check.result
      Text conflict in mysql-test/r/sp-code.result
      Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
      Text conflict in mysql-test/suite/rpl/t/disabled.def
      Text conflict in mysql-test/t/show_check.test
      Text conflict in mysys/my_delete.c
      Text conflict in sql/item.h
      Text conflict in sql/item_cmpfunc.h
      Text conflict in sql/log.cc
      Text conflict in sql/mysqld.cc
      Text conflict in sql/repl_failsafe.cc
      Text conflict in sql/slave.cc
      Text conflict in sql/sql_parse.cc
      Text conflict in sql/sql_table.cc
      Text conflict in sql/sql_yacc.yy
      Text conflict in storage/myisam/ha_myisam.cc
      
      Corrected results for
       stm_auto_increment_bug33029.reject      2009-12-01
      		20:01:49.000000000 +0300
             <andrei> @@ -42,9 +42,6 @@
             <andrei>  RETURN i;
             <andrei>  END//
             <andrei>  CALL p1();
             <andrei> -Warnings:
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
      
      There should be indeed no Note present because there is in fact autoincrement 
      top-level query in sp() that triggers inserting in yet another auto-inc table.
      (todo: alert DaoGang to improve the test).
      0eda4846
    • Alexander Nozdrin's avatar
      A patch for Bug#48915 (After having switched off the ipv6 support in OS, · 273454b9
      Alexander Nozdrin authored
      mysqld crashed in network_init()).
      
      The problem was that current_thd was not ready at that point in mysqld life,
      so ER() macro could not be used.
      
      The fix is to use ER_DEFAULT() macro, which is intented for such cases.
      273454b9
    • Marc Alff's avatar
      WL#2360 Performance schema · f2d67abb
      Marc Alff authored
      Part 1: Instrumentation interface
      f2d67abb
  9. 30 Nov, 2009 3 commits
  10. 28 Nov, 2009 1 commit
  11. 27 Nov, 2009 4 commits
  12. 26 Nov, 2009 5 commits
  13. 25 Nov, 2009 8 commits
    • Magne Mahre's avatar
      Addition to BUG#36573 - myisampack --join does not create destination table · 0b869659
      Magne Mahre authored
                            .frm file
            
      Added FLUSH TABLES before myisampack --join operation to fix the test 
      warnings or errors
      Removed unused variable in create_dest_frm() method
      0b869659
    • Magne Mahre's avatar
      Fix for Bug#36573 myisampack --join does not create destination · 952f8bda
      Magne Mahre authored
      table .frm file
                  
      Problem:
      ========
      Myisampack --join did not create the destination table .frm file. 
      The user had to copy one of the source table .frm file as destination .frm 
      file for mysql server to recognize. This is just 'user-friendliness' issue.
                  
      How it was solved
      =================
      After successful join and compression we copy the frm file from the first 
      source table.
                  
      Functionality added
      ===================
      myisampack --join=/path/t3 /path/t1 /path/t2 creates 
      /path/t3.frm (which is bascially copied from first table's frm /path/t1)
            
      Tests
      =====
      Modified myisampack.test to test two scenario's
      1. Positive myisampack --join test
         In this case after the join operation is done,we test if the destination 
         table is accessible from the server
      2. Positive myisampack --join test with an existing .frm file.
         We test the above case with an existing .frm file for the destination 
         table. It should return success even in this case.
      3. Positive myisampack --join test with no .frm file for source tables
         We test the join operation with no .frm files for source tables. It should
         complete the join operation without any warnings and error messages
      4. Negative myisampack --join test
         We test myisampack --join with existing .MYI,.MDI,.frm files for the 
         destination table. It should fail with exit status 2 in this case.
      952f8bda
    • Magne Mahre's avatar
      Disable the testcase for BUG#45816 in partition.test in mysql-pe · aaca72b4
      Magne Mahre authored
      branch due to BUG#46853
            
      Commented out the testcase for Bug#45816 in mysql-pe branch
      due to valgrind warnings. Please see Bug#46853
      aaca72b4
    • Magne Mahre's avatar
      Bug#40677 Archive tables joined on primary return no result · dd6fd68f
      Magne Mahre authored
      Select queries on archive tables when joined on their primary keys
      returns no results(empty set)
            
      Archive storage doesn't inform the handler about the fetched record 
      status when it is found. Fixed the archive storage engine to update
      the record status when it fetches successfully
      
      dd6fd68f
    • Alexander Nozdrin's avatar
      Update result files. · 1792de0a
      Alexander Nozdrin authored
      1792de0a
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 3c11750e
      Alexander Nozdrin authored
      3c11750e
    • Alik's avatar
      Fix typo (s/_WIN_/__WIN__). · d19168a9
      Alik authored
      d19168a9
    • Sergey Vojtovich's avatar
      Backport from 6.0-codebase. · 40ec012c
      Sergey Vojtovich authored
      WL#3951 - MyISAM: Additional Error Logs for Data Corruption
      
      When table corruption is detected, in addition to current error message
      provide following information:
      - list of threads (and queries) accessing a table;
      - thread_id of a thread that detected corruption;
      - source file name and line number where this corruption was detected;
      - optional extra information (string).
      
      mysql-test/r/myisam_crash_before_flush_keys.result:
        Adjusted a test case according to WL#3951.
      mysql-test/t/myisam_crash_before_flush_keys.test:
        Adjusted a test case according to WL#3951.
      storage/myisam/CMakeLists.txt:
        Added mi_extrafunc.h to myisam sources list.
      storage/myisam/Makefile.am:
        Added mi_extrafunc.h to myisam headers list.
      storage/myisam/ha_myisam.cc:
        Added _mi_report_crashed() function (reports additional information
        whenever table corruption is detected).
      storage/myisam/mi_extrafunc.h:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/mi_locking.c:
        For every call to mi_lock_database(F_[RD|WR|EXTRA_]LCK) - add
        current thread to the list of threads accessing this table.
        
        For every call to mi_lock_database(F_UNLCK) - remove current
        thread from the list of threads accessing this table.
      storage/myisam/mi_test1.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/mi_test2.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/mi_test3.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/myisam_ftdump.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/myisamchk.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/myisamdef.h:
        Extra elements are added to MI_INFO and MYISAM_SHARE structures.
        MI_INFO is extended with LIST element, that holds a pointer to
        THD object accessing a table. MYISAM_SHARE is extended with LIST
        (list of threads accessing a table).
        
        Whenever table is marked as crashed, call mi_report_crashed() macro
        to provide useful information.
      storage/myisam/myisamlog.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/myisampack.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/rt_test.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisam/sp_test.c:
        All standalone programs must define their version of _mi_report_crashed()
        by including mi_extrafunc.h.
      storage/myisammrg/ha_myisammrg.cc:
        For each unedrlying table initialize `in_use' variable.
      40ec012c