1. 14 Dec, 2009 2 commits
  2. 11 Dec, 2009 6 commits
  3. 10 Dec, 2009 5 commits
  4. 09 Dec, 2009 2 commits
  5. 08 Dec, 2009 5 commits
  6. 07 Dec, 2009 4 commits
    • He Zhenxing's avatar
      Auto merge · 8ec8b076
      He Zhenxing authored
      8ec8b076
    • Sergey Vojtovich's avatar
      WL#2511 - Add a new table to the Information Schema for TABLESPACE's · 31efab3f
      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.
      31efab3f
    • Alexander Barkov's avatar
      Bug#47756 Setting 2byte collation ID with 'set names' crashes the server · 6e7cffac
      Alexander Barkov authored
      The problem is not actually related to 2byte collation IDs.
      The same crash happens if you change the collation ID in
      mysql-test/str_data/Index.xml to a value smaller than 256.
      
      Crash happened in SQL parser, because the "ident_map" and "state_map"
      arrays were not initialized in loadable utf8 collations.
      
      Fix: adding proper initialization of the "ident_map" and "state_map"
      members for loadable utf8 collations.
      6e7cffac
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 3a2c3044
      Alexander Nozdrin authored
      3a2c3044
  7. 05 Dec, 2009 3 commits
  8. 04 Dec, 2009 9 commits
  9. 03 Dec, 2009 4 commits
    • V Narayanan's avatar
      Bug#40814 CSV engine does not parse \X characters when they occur in unquoted fields · e5eaa8b6
      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.
      e5eaa8b6
    • V Narayanan's avatar
      WL#4454 change sql_insert.cc::last_uniq_key to match keys in any order · b885a194
      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.
      b885a194
    • Konstantin Osipov's avatar
      Merge next-mr -> next-mr-runtime · f26c7bcd
      Konstantin Osipov authored
      f26c7bcd
    • V Narayanan's avatar
      WL#4448 Generalize the handlerton::fill_files_table call with handlerton::fill_is_table · fd9c147c
      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.
      fd9c147c