pbxtplugin/pbxt_compile.patch

   1 diff -urN 2.0/.bzr/branch/branch.conf 2.0b/.bzr/branch/branch.conf
   2 --- 2.0/.bzr/branch/branch.conf 2011-01-05 16:40:32.813333366 -0700
   3 +++ 2.0b/.bzr/branch/branch.conf        1969-12-31 17:00:00.000000000 -0700
   4 @@ -1 +0,0 @@
   5 -parent_location = http://bazaar.launchpad.net/~pbxt-core/pbxt/2.0/
   6 diff -urN 2.0/.bzr/branch/format 2.0b/.bzr/branch/format
   7 --- 2.0/.bzr/branch/format      2011-01-05 16:40:32.416666699 -0700
   8 +++ 2.0b/.bzr/branch/format     1969-12-31 17:00:00.000000000 -0700
   9 @@ -1 +0,0 @@
  10 -Bazaar Branch Format 6 (bzr 0.15)
  11 diff -urN 2.0/.bzr/branch/last-revision 2.0b/.bzr/branch/last-revision
  12 --- 2.0/.bzr/branch/last-revision       2011-01-05 16:40:32.426666699 -0700
  13 +++ 2.0b/.bzr/branch/last-revision      1969-12-31 17:00:00.000000000 -0700
  14 @@ -1 +0,0 @@
  15 -926 paul.mccullagh@primebase.org-20101210134955-a3t0v0ddx2fi8vy5
  16 diff -urN 2.0/.bzr/branch-format 2.0b/.bzr/branch-format
  17 --- 2.0/.bzr/branch-format      2011-01-05 16:38:48.970000031 -0700
  18 +++ 2.0b/.bzr/branch-format     1969-12-31 17:00:00.000000000 -0700
  19 @@ -1 +0,0 @@
  20 -Bazaar-NG meta directory, format 1
  21 diff -urN 2.0/.bzr/checkout/conflicts 2.0b/.bzr/checkout/conflicts
  22 --- 2.0/.bzr/checkout/conflicts 2011-01-05 16:40:38.143333365 -0700
  23 +++ 2.0b/.bzr/checkout/conflicts        1969-12-31 17:00:00.000000000 -0700
  24 @@ -1 +0,0 @@
  25 -BZR conflict list format 1
  26 Binary files 2.0/.bzr/checkout/dirstate and 2.0b/.bzr/checkout/dirstate differ
  27 diff -urN 2.0/.bzr/checkout/format 2.0b/.bzr/checkout/format
  28 --- 2.0/.bzr/checkout/format    2011-01-05 16:40:32.820000032 -0700
  29 +++ 2.0b/.bzr/checkout/format   1969-12-31 17:00:00.000000000 -0700
  30 @@ -1 +0,0 @@
  31 -Bazaar Working Tree Format 4 (bzr 0.15)
  32 diff -urN 2.0/.bzr/README 2.0b/.bzr/README
  33 --- 2.0/.bzr/README     2011-01-05 16:38:48.970000031 -0700
  34 +++ 2.0b/.bzr/README    1969-12-31 17:00:00.000000000 -0700
  35 @@ -1,3 +0,0 @@
  36 -This is a Bazaar control directory.
  37 -Do not change any files in this directory.
  38 -See http://bazaar-vcs.org/ for more information about Bazaar.
  39 diff -urN 2.0/.bzr/repository/format 2.0b/.bzr/repository/format
  40 --- 2.0/.bzr/repository/format  2011-01-05 16:38:49.003333365 -0700
  41 +++ 2.0b/.bzr/repository/format 1969-12-31 17:00:00.000000000 -0700
  42 @@ -1 +0,0 @@
  43 -Bazaar pack repository format 1 (needs bzr 0.92)
  44 Binary files 2.0/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.iix and 2.0b/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.iix differ
  45 Binary files 2.0/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.rix and 2.0b/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.rix differ
  46 diff -urN 2.0/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.six 2.0b/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.six
  47 --- 2.0/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.six    2011-01-05 16:40:32.403333365 -0700
  48 +++ 2.0b/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.six   1969-12-31 17:00:00.000000000 -0700
  49 @@ -1,5 +0,0 @@
  50 -Bazaar Graph Index 1
  51 -node_ref_lists=0
  52 -key_elements=1
  53 -len=0
  54 -
  55 Binary files 2.0/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.tix and 2.0b/.bzr/repository/indices/fb2c3778292e6860570041cf9ad22eb8.tix differ
  56 Binary files 2.0/.bzr/repository/pack-names and 2.0b/.bzr/repository/pack-names differ
  57 Binary files 2.0/.bzr/repository/packs/fb2c3778292e6860570041cf9ad22eb8.pack and 2.0b/.bzr/repository/packs/fb2c3778292e6860570041cf9ad22eb8.pack differ
  58 diff -urN 2.0/src/ha_pbxt.cc 2.0b/src/ha_pbxt.cc
  59 --- 2.0/src/ha_pbxt.cc  2011-01-05 16:40:36.407820000 -0700
  60 +++ 2.0b/src/ha_pbxt.cc 2011-01-11 00:50:08.646666893 -0700
  61 @@ -2025,7 +2025,7 @@
  62                         xt_ha_open_database_of_table(self, (XTPathStrPtr) NULL);
  63                 }
  64
  65 -               err = myxt_statistics_fill_table(self, thd, tables, cond, system_charset_info);
  66 +               err = myxt_statistics_fill_table(self, thd, tables, cond, (void*)system_charset_info);
  67         }
  68         catch_(a) {
  69                 err = xt_ha_pbxt_thread_error_for_mysql(thd, self, FALSE);
  70 @@ -5855,7 +5855,7 @@
  71         MYSQL_PLUGIN_VAR_HEADER;
  72  };
  73
  74 -static void pbxt_record_cache_size_func(THD *XT_UNUSED(thd), struct st_mysql_sys_var *var, void *tgt, const void *save)
  75 +static void pbxt_record_cache_size_func(THD *XT_UNUSED(thd), struct st_mysql_sys_var *var, void *tgt,const  void *save)
  76  {
  77         xtInt8  record_cache_size;
  78
  79 diff -urN 2.0/src/myxt_xt.cc 2.0b/src/myxt_xt.cc
  80 --- 2.0/src/myxt_xt.cc  2011-01-05 16:40:36.407820000 -0700
  81 +++ 2.0b/src/myxt_xt.cc 2011-01-11 00:47:49.106666893 -0700
  82 @@ -2300,7 +2300,7 @@
  83                 seg->length = key_part->length;
  84                 seg->bit_start = seg->bit_end = 0;
  85                 seg->bit_length = seg->bit_pos = 0;
  86 -               seg->charset = field->charset();
  87 +               seg->charset = (struct charset_info_st*)field->charset();
  88
  89                 if (field->null_ptr) {
  90                         key_length++;