mysql-charset-free.patch

   1 From: Date: February 26 2010 2:37pm
   2 Subject: bzr commit into mysql-5.1-bugteam branch (staale.smedseng:3358) Bug#45058
   3 List-Archive: http://lists.mysql.com/commits/101654
   4 X-Bug: 45058
   5 MIME-Version: 1.0
   6 Content-Type: multipart/mixed; boundary="===============2894997089832222545=="
   7
   8 --===============2894997089832222545==
   9 MIME-Version: 1.0
  10 Content-Type: text/plain; charset="us-ascii"
  11 Content-Transfer-Encoding: 7bit
  12 Content-Disposition: inline
  13
  14 #At file:///export/home/tmp/ss156133/z/45058-akonadi-51/ based on revid:gshchepa@stripped
  15
  16  3358 Staale Smedseng   2010-02-26
  17       Bug #45058 init_available_charsets uses double checked locking
  18
  19       A client doing multiple mysql_library_init() and
  20       mysql_library_end() calls over the lifetime of the process may
  21       experience lost character set data, potentially even a
  22       SIGSEGV.
  23
  24       This patch reinstates the reloading of character set data when
  25       a mysql_library_init() is done after a mysql_library_end().
  26
  27     modified:
  28       include/my_sys.h
  29       libmysql/libmysql.c
  30       mysys/charset.c
  31       mysys/my_init.c
  32       sql/mysqld.cc
  33 === modified file 'include/my_sys.h'
  34 --- a/include/my_sys.h  2009-12-12 18:11:25 +0000
  35 +++ b/include/my_sys.h  2010-02-26 13:37:03 +0000
  36 @@ -950,7 +950,7 @@ extern my_bool resolve_charset(const cha
  37  extern my_bool resolve_collation(const char *cl_name,
  38                                   CHARSET_INFO *default_cl,
  39                                   CHARSET_INFO **cl);
  40 -
  41 +extern void free_charsets(void);
  42  extern char *get_charsets_dir(char *buf);
  43  extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
  44  extern my_bool init_compiled_charsets(myf flags);
  45
  46 === modified file 'libmysql/libmysql.c'
  47 --- a/libmysql/libmysql.c       2009-12-18 18:44:24 +0000
  48 +++ b/libmysql/libmysql.c       2010-02-26 13:37:03 +0000
  49 @@ -211,6 +211,7 @@ void STDCALL mysql_server_end()
  50    }
  51    else
  52    {
  53 +    free_charsets();
  54      mysql_thread_end();
  55    }
  56
  57
  58 === modified file 'mysys/charset.c'
  59 --- a/mysys/charset.c   2009-12-15 09:48:29 +0000
  60 +++ b/mysys/charset.c   2010-02-26 13:37:03 +0000
  61 @@ -427,6 +427,11 @@ static void init_available_charsets(void
  62  }
  63
  64
  65 +void free_charsets(void)
  66 +{
  67 +  charsets_initialized= MY_PTHREAD_ONCE_INIT;
  68 +}
  69 +
  70  uint get_collation_number(const char *name)
  71  {
  72    my_pthread_once(&charsets_initialized, init_available_charsets);
  73
  74 === modified file 'mysys/my_init.c'
  75 --- a/mysys/my_init.c   2009-12-12 18:11:25 +0000
  76 +++ b/mysys/my_init.c   2010-02-26 13:37:03 +0000
  77 @@ -165,6 +165,7 @@ void my_end(int infoflag)
  78        my_print_open_files();
  79      }
  80    }
  81 +  free_charsets();
  82    my_error_unregister_all();
  83    my_once_free();
  84
  85
  86 === modified file 'sql/mysqld.cc'
  87 --- a/sql/mysqld.cc     2010-02-05 12:55:20 +0000
  88 +++ b/sql/mysqld.cc     2010-02-26 13:37:03 +0000
  89 @@ -1287,6 +1287,7 @@ void clean_up(bool print_message)
  90    lex_free();                          /* Free some memory */
  91    item_create_cleanup();
  92    set_var_free();
  93 +  free_charsets();
  94    if (!opt_noacl)
  95    {
  96  #ifdef HAVE_DLOPEN
  97
  98
  99 --===============2894997089832222545==
 100 MIME-Version: 1.0
 101 Content-Type: text/bzr-bundle; charset="us-ascii";
 102         name="bzr/staale.smedseng@stripped"
 103 Content-Transfer-Encoding: 7bit
 104 Content-Disposition: inline
 105
 106 # Bazaar merge directive format 2 (Bazaar 0.90)
 107 # revision_id: staale.smedseng@stripped
 108 # target_branch: file:///export/home/tmp/ss156133/z/45058-akonadi-51/
 109 # testament_sha1: fd2350d19bfb4ab3e3d43c1aba8e9f82cea0e7be
 110 # timestamp: 2010-02-26 14:37:07 +0100
 111 # base_revision_id: gshchepa@stripped
 112 #
 113 # Begin bundle
 114 IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa35uC4ABAHfgEAQWWf//37j
 115 3SC////6YAhd9CAAAFAAAAAAHMCYmgwmTJkyMJgmmmRiYAhgOYExNBhMmTJkYTBNNMjEwBDAcwJi
 116 aDCZMmTIwmCaaZGJgCGAaaTRTRlNplPTU09T1PU9TTQBoADQBkyaHMCYmgwmTJkyMJgmmmRiYAhg
 117 EkgQABAExMQBNBBqeTU9EA8pI7XJs+CrNRtGupJFQL7+fiPXNXmNesiONFCFFJahpb9UJvnP92AX
 118 4o7c2GZudD3D5Vur6fah9ureqA3EuAvsi5ASSSSQhM1QQaGgRKRMRPPOVcH0l11zF6xQVxgXkKeW
 119 uTOtA+ZaGy3GTQKg9B90iIbiYXSQYxYq3G9cQMz5WQLzNaWQTEQBCArBwOC9ThsGT+tqbdyYGyLv
 120 gG6YRiKdBbD8W+z95Ai22OARLM5tsJxI4i12VEbZTmLMYvVNQkW6jR0MhJrWOxbBxcPHDCcWNgaC
 121 Jz/xjVWWXgwxSuCewyYSqV6A0i+SHIh1cirv4aJwFgxGDncGfIRrSBwkPEOEYOEGcRKAh8YFBq+D
 122 iUgkSnEYhQUCgTfmYNBS4dxWwSuQUNey341K8QRYEftfgrSed+R3frSsBqzKNqd0lGdqKYFCtkJM
 123 pyHaKMCo0kXWTFimJvfMr7MjxvpVmRsETEoq8TzFEj/iJ1WMZD0hw35qVNDVuGmm06pTJIdMaic6
 124 jE2lODImQGVRUa6iMZi9NmOEnRGIFDqGA9Sw1jpHeYG4npiUM11Q0arRKy9wiZRjRInKHDzIYmwk
 125 SJQEnbxLA5Epp9pdc8SbYVVjES0ao0kDS8wJfk0UlGVVlTyuMc75CuvHZvOg8cXDZYft8ZR73aJy
 126 4s54HITEiYcTFY4Y4locT8GRqEncrtbNjpdiNrIQL8zXorJEyibemmyQ4ZfnE7yWmmkfMXmZ2GNI
 127 TmA+YsEOtIF5ie2w1nb0Xmdnf3HYZnIcby2/H4XQgO0CV5CRuyNpHbI8Y7GqKb3vLys3JcuUi8gX
 128 nh0gaDocsjJmsEMJOLRtKrNBVgcv2d86jm8sMcrTWxfYTFqUxApKAxEsNZuEuBmdxWdTTldbVLJi
 129 k3lMFI1SNhI4SoNBURITjzSPJGJB9paUBOPsH6Z3Pc1o5gGsomBgmKRww9WmpOETMSJCLS0YtIkC
 130 0cMejk9rGHFzidKhJ0wpFIEveH/up+6qYR5sYv78BzA0hub3DRYGSPFDHd9RfD2fJxJyuirTGkYI
 131 RNj4gqEgoCSsuf00v1fWiKltd3HquMNOmOWiX4hH8Wfj86dAtxueh4nD0bnge8IP+skSZDK8seQB
 132 ex2n6BQfp7Fh6neqRB9vYwiOPUl4FBRV83GOZID73eQg+J8mzVQsv5oq1fp9atcDIS+xF4icGKF8
 133 SVVZ4QI/vUYH1JzcfM45mI80k59nm0pKDgOOJE4lZp+lmneHowfQp6gHYsWEwTlxutNpgYGkmMzu
 134 IlBymMNVq2lZpvL3QJptNx0x3Uat15S44CecV1KptVcqYZJIfHadxOTltFBMOHG1E62GBu4H0Opv
 135 MSpKYiTJbok5LaTltolkbSg7TdoJxqy0d2ia/+BLQvuTWK4QfQ2fY8CjmbtTC46HSeRS6QQDkMi4
 136 nvW8oY6tCBcSNwMaiRyC5rhYmdDI5XPQwoAUGOJgDuDvvXWIHluaLaB3gT8BJ/mUjq39vceggdFG
 137 cU5BnMqN0lKyqBCnk5gc6o0bDLNSFOZOS4YAsDrWkMxPxg29I5jG0grTIY5ch5qLzuJz0JzqcDxm
 138 Fq2dowt39I1I2C1m3WT9nWS1iW8cfyxj5UGM/ky8jVZIidpuEpkAxSIdQQJRNWJ6WH432G73ajvP
 139 WXBvd5DD9QlpPVPoBMhd45YK+GhlOfX0NJ7GXNIanxzPQfobm04DuHhwD3CUIyGpF3+46cwCS7uv
 140 sBk1lNiJN4/68548AVTulGoE40JYPCZGRgXPLzvEpjgbxiCrEtY+OYDpyK9ZtWkr9i2PA9EFKUw4
 141 LfcdLyCrskiT0A5D2F5nZ6sZBltnXlMOtgQ1+rOmHF5Msx9RpSRka+argYUC/iZAf1zibzZyLuRV
 142 7V+grrt3KffmMxAPyHdMoxDfi1tW5IHay5wjqNSKR1nlQzhwEhhzDIB9L0vUwzrpjOIZkGpy9CHx
 143 7yfbxi3eOxMjxORa8LYeHVJEBrwXjLzqROBcqHK12vXPdMJXAErML1IXXrzSfzkLbaGn2NPhbRZy
 144 pfbaNqPU2GZ2UGLvPSS10FsADiX9hEgUEpmS30uetQHej5cG+Alij3aicS1eL0a2T7CyZrFpdQXt
 145 nhM4HiIkzHIcPBtRvjoze+kViJx7xmJHaIO3diS5iKbSQrxb1AE5HEK0uR8UBE8hbGZmZmZuhl4s
 146 JXI1f9uJydJkR3QA7T0SB28pMVt20FF44ZhhjRukbSMkeAiB7UJB7D+MdHTsN8JcRFvicS8guNWG
 147 HIzkU9pTkBMrWmEw07kqHFcioop/Wk2GVXnQCO0vyLTZ7x9pjSr7/WREFcexEceVnxIHuGW07MTP
 148 xNB3TGszLyy5UaSk6Hw99HvWBrEqImRApLELW4ccS82Y7+bMwVpmW9dCJS/M1okgHkLKyq0cLiNp
 149 lftMi6bIyMTsP/i7kinChIVvzcFw
 150
 151
 152 --===============2894997089832222545==--