Commit c5f13dd2 authored by unknown's avatar unknown
Browse files

Merge monty@192.168.0.9:/my/mysql-5.1 

into  mysql.com:/home/my/mysql-5.1


sql/handler.cc:
  Auto merged
parents 460b8241 e03f8ef2

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -4095,8 +4095,8 @@ static void append_metadata(DYNAMIC_STRING *ds, 
static void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows,

			const char *info)

{

  char buf[40];

  sprintf(buf,"affected rows: %llu\n", affected_rows);

  char buf[40], buff2[21];

  sprintf(buf,"affected rows: %s\n", llstr(affected_rows, buff2));

  dynstr_append(ds, buf);

  if (info)

  {

mysys/my_bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static inline void bitmap_unlock(MY_BITMAP *map __attribute__((unused))) 




my_bool bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,

		    my_bool thread_safe)

		    my_bool thread_safe __attribute__((unused)))

{

  DBUG_ENTER("bitmap_init");

  if (!buf)

mysys/my_handler.c

+6 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) 
    switch ((enum ha_base_keytype) keyseg->type) {

    case HA_KEYTYPE_TEXT:

    case HA_KEYTYPE_BINARY:

    case HA_KEYTYPE_BIT:

      if (keyseg->flag & HA_SPACE_PACK)

      {

        int a_length;
@@ -515,7 +516,9 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) 
        a= end;

      break;

    case HA_KEYTYPE_VARTEXT1:

    case HA_KEYTYPE_VARTEXT2:

    case HA_KEYTYPE_VARBINARY1:

    case HA_KEYTYPE_VARBINARY2:

      {

        int a_length;

        get_key_length(a_length, a);
@@ -545,6 +548,9 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) 
    case HA_KEYTYPE_DOUBLE:

      a= end;

      break;

    case HA_KEYTYPE_END:

      DBUG_ASSERT(0);

      break;

    }

  }

  return keyseg;

mysys/thr_lock.c

+5 −2
Original line number Diff line number Diff line
@@ -1123,10 +1123,12 @@ void thr_downgrade_write_lock(THR_LOCK_DATA *in_data, 
                              enum thr_lock_type new_lock_type)

{

  THR_LOCK *lock=in_data->lock;

  THR_LOCK_DATA *data, *next;

  enum thr_lock_type old_lock_type= in_data->type;

#ifdef TO_BE_REMOVED

  THR_LOCK_DATA *data, *next;

  bool start_writers= FALSE;

  bool start_readers= FALSE;

#endif

  DBUG_ENTER("thr_downgrade_write_only_lock");



  pthread_mutex_lock(&lock->mutex);
@@ -1134,7 +1136,8 @@ void thr_downgrade_write_lock(THR_LOCK_DATA *in_data, 
  DBUG_ASSERT(old_lock_type > new_lock_type);

  in_data->type= new_lock_type;

  check_locks(lock,"after downgrading lock",0);

#if 0



#if TO_BE_REMOVED

  switch (old_lock_type)

  {

    case TL_WRITE_ONLY:

plugin/fulltext/plugin_example.c

+4 −2
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ static int simple_parser_plugin_deinit(void) 
    1                    failure (cannot happen)

*/



static int simple_parser_init(MYSQL_FTPARSER_PARAM *param)

static int simple_parser_init(MYSQL_FTPARSER_PARAM *param

                              __attribute__((unused)))

{

  return(0);

}
@@ -117,7 +118,8 @@ static int simple_parser_init(MYSQL_FTPARSER_PARAM *param) 
    1                    failure (cannot happen)

*/



static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param)

static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param

                                __attribute__((unused)))

{

  return(0);

}