1. 20 Jul, 2007 5 commits
  2. 19 Jul, 2007 8 commits
  3. 18 Jul, 2007 6 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c1d12ec7
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      c1d12ec7
    • unknown's avatar
      ddl_i18n_utf8.test, ddl_i18n_koi8r.test: · b55bb35c
      unknown authored
        Don't run test with embedded server; requires external client connections
      
      
      mysql-test/t/ddl_i18n_koi8r.test:
        Don't run test with embedded server; requires external client connections
      mysql-test/t/ddl_i18n_utf8.test:
        Don't run test with embedded server; requires external client connections
      b55bb35c
    • unknown's avatar
      Bug#26909: Specified key was too long; max key length is 255 bytes \ · 8b8b430b
      unknown authored
      	when creating table
      
      Federated tables had an artificially low maximum of key length, 
      because the handler failed to implement a method to return it and 
      the default value is taked from the prototype handler.
      
      Now, implement that method and return the maximum possible key
      length, which is that of InnoDB.
      
      
      mysql-test/r/federated.result:
        Verify that unique keys may be longer than 255 characters.
      mysql-test/t/federated.test:
        Verify that unique keys may be longer than 255 characters.
      sql/ha_federated.h:
        Implement the virtual method that tells the max size of parts to 
        make a key.
        
        Backport the length defined in 5.1.
      8b8b430b
    • unknown's avatar
      Re-set the plugin name so that we can be sure the plugin init() · b79daf41
      unknown authored
      function doesn't set it to something else.
      
      
      b79daf41
    • unknown's avatar
      Move the filling of the table_name column above the initialization, · 6d0419f6
      unknown authored
      so that the init function has access to the name.
      
      
      6d0419f6
    • unknown's avatar
      Fix for bug #28125: ERROR 2013 when adding index. · 6947f2d1
      unknown authored
      Problem: we may break a multibyte char sequence using a key 
      reduced to maximum allowed length for a storage engine
      (that leads to failed assertion in the innodb code, 
      see also #17530). 
      
      Fix: align truncated key length to multibyte char boundary.
      
      
      mysql-test/r/innodb_mysql.result:
        Fix for bug #28125: ERROR 2013 when adding index.
          - test result.
      mysql-test/t/innodb_mysql.test:
        Fix for bug #28125: ERROR 2013 when adding index.
          - test case.
      sql/sql_table.cc:
        Fix for bug #28125: ERROR 2013 when adding index.
          - align truncated key length to multibyte char boundary.
          - display real key length in bytes raising warnings.
      6947f2d1
  4. 17 Jul, 2007 15 commits
  5. 16 Jul, 2007 6 commits
    • unknown's avatar
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · f614b4b0
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      f614b4b0
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.1-amain · 351f811f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      351f811f
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 0a5ece11
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/sp.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/include/mix1.inc:
        Manual merge.
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      0a5ece11
    • unknown's avatar
      Post-merge fixes (merge from the main). · bc642e11
      unknown authored
      
      mysql-test/r/innodb_mysql.result:
        Update test results (merge from the main tree).
      mysql-test/r/query_cache.result:
        Update test results (merge from the main tree).
      mysql-test/r/sp.result:
        Update test results (merge from the main tree).
      mysql-test/t/query_cache.test:
        Use --echo End of to simplify future merges.
      sql/handler.h:
        st_table_list -> TABLE_LIST
      sql/item_create.cc:
        A post-merge fix (this code is in sql_yacc.yy in 5.0)
      sql/rpl_utility.h:
        st_table_list -> TABLE_LIST
      sql/sp.cc:
        A post-merge fix.
      sql/sp_head.cc:
        In 5.1 memdup_root returns void*.
      sql/sql_show.cc:
        st_table_list -> TABLE_LIST
      sql/sql_show.h:
        st_table_list -> TABLE_LIST
      sql/sql_yacc.yy:
        A post-merge fix.
      sql/table.cc:
        st_table_list -> TABLE_LIST
      sql/table.h:
        st_table_list -> TABLE_LIST
      bc642e11
    • unknown's avatar
      Merge sin.intern.azundris.com:/home/tnurnberg/27198/40-27198 · e587830c
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/27198/41-27198
      
      
      sql/mysql_priv.h:
        Bug #27198: Error returns from time() are ignored
        
        manual merge
      sql/sql_class.h:
        Bug #27198: Error returns from time() are ignored
        
        manual merge
      e587830c