~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_search.c

  • Committer: Jay Pipes
  • Date: 2008-07-17 17:44:14 UTC
  • mfrom: (177 drizzle)
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717174414-sm1e9agb2fjw2ncz
Merged in from trunk.

Made following changes:

libdrizzle/
  client.c
  * Removed DBUG symbols entirely
  * Removed mysql_debug() calls and command line options
  libdrizzle.c
  * Removed DBUG symbols
include/my_sys.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())
mysys/my_init.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())

Show diffs side-by-side

added added

removed removed

Lines of Context:
271
271
  */
272
272
  int flag=0, my_flag=-1;
273
273
  uint nod_flag, length=0, len, matched, cmplen, kseg_len;
274
 
  uint prefix_len,suffix_len;
275
 
  int key_len_skip, seg_len_pack, key_len_left;
 
274
  uint prefix_len=0,suffix_len;
 
275
  int key_len_skip, seg_len_pack=0, key_len_left;
276
276
  uchar *end, *kseg, *vseg;
277
277
  uchar *sort_order=keyinfo->seg->charset->sort_order;
278
278
  uchar tt_buff[MI_MAX_KEY_BUFF+2], *t_buff=tt_buff+2;
280
280
  uint  saved_length=0, saved_prefix_len=0;
281
281
  uint  length_pack;
282
282
 
 
283
 
283
284
  t_buff[0]=0;                                  /* Avoid bugs */
284
285
  end= page+mi_getint(page);
285
286
  nod_flag=mi_test_if_nod(page);