← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/handler0alter.cc

  • Committer: Monty Taylor
  • Date: 2009-06-08 19:10:56 UTC
  • mto: This revision was merged to the branch mainline in revision 1060.
  • Revision ID: mordred@inaugust.com-20090608191056-ycp5b4rgb2hv1ufx
First pass at removing strconvert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/handler0alter.cc
200
200
/*=======================*/
201
201
        char*   s)      /* in: identifier; out: decoded identifier */
202
202
{
203
 
        uint    errors;
204
203
 
205
204
        char*   slash = strchr(s, '/');
206
205
 
208
207
                char*   t;
209
208
                /* Temporarily replace the '/' with NUL. */
210
209
                *slash = 0;
211
 
                /* Convert the database name. */
212
 
                strconvert(&my_charset_filename, s, system_charset_info,
213
 
                           s, slash - s + 1, &errors);
 
210
                strncpy(s, s, slash - s + 1);
214
211
 
215
212
                t = s + strlen(s);
216
213
                ut_ad(slash >= t);
218
215
                *t++ = '.';
219
216
                slash++;
220
217
                /* Convert the table name. */
221
 
                strconvert(&my_charset_filename, slash, system_charset_info,
222
 
                           t, slash - t + strlen(slash), &errors);
223
 
        } else {
224
 
                strconvert(&my_charset_filename, s,
225
 
                           system_charset_info, s, strlen(s), &errors);
 
218
                strncpy(t, slash, slash - t + strlen(slash));
226
219
        }
227
220
}
228
221