← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/mysql-dfsg-5.0/gutsy

« back to all changes in this revision

Viewing changes to libmysqld/ha_innodb.cc

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-04-03 09:43:01 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20070403094301-fnjhfr59hu72pvtg
Tags: 5.0.38-0ubuntu1
* Package the Enterprise version again (.37 was a community version), since
  Debian and we have always done so. This brings in a few more bug fixes and
  makes functional derivations less likely.
* debian/README.Maintainer: Add pointer to upstream download URL, since it
  is very hard to find the Enterprise versions.
* Disable 33_scripts__mysql_create_system_tables__no_test.dpatch, since that
  script was removed upstream.
* debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch: Adapted to
  changed formatting in new upstream version.
* Remove debian/patches/86_PATH_MAX.dpatch, fixed upstream.
* Add debian/patches/90_org_tables_definition.dpatch: Fix local variable
  declaration in libmysqld/sql_parse.cc to fix compilation with
  EMBEDDED_LIBRARY.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysqld/ha_innodb.cc
2711
2711
                                true_len = (ulint) cs->cset->well_formed_len(cs,
2712
2712
                                                (const char *) data,
2713
2713
                                                (const char *) data + len,
2714
 
                                                key_len / cs->mbmaxlen,
 
2714
                                                (uint) (key_len /
 
2715
                                                        cs->mbmaxlen),
2715
2716
                                                &error);
2716
2717
                        }
2717
2718
 
2780
2781
                                                (const char *) blob_data,
2781
2782
                                                (const char *) blob_data
2782
2783
                                                        + blob_len,
2783
 
                                                key_len / cs->mbmaxlen,
 
2784
                                                (uint) (key_len /
 
2785
                                                        cs->mbmaxlen),
2784
2786
                                                &error);
2785
2787
                        }
2786
2788
 
2852
2854
                                                        (const char *)src_start,
2853
2855
                                                        (const char *)src_start
2854
2856
                                                                + key_len,
2855
 
                                                        key_len / cs->mbmaxlen,
 
2857
                                                        (uint) (key_len /
 
2858
                                                                cs->mbmaxlen),
2856
2859
                                                        &error);
2857
2860
                                }
2858
2861
                        }