Commit 50ff7274 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
parents 2957088d 4d3d7032

libmysql/libmysql.c

+17 −14
Original line number Diff line number Diff line
@@ -1495,6 +1495,7 @@ const char * STDCALL mysql_character_set_name(MYSQL *mysql) 
  return mysql->charset->csname;

}





int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name)

{

  struct charset_info_st *cs;
@@ -1508,24 +1509,26 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name) 
    char buff[MY_CS_NAME_SIZE + 10];

    charsets_dir= save_csdir;

    sprintf(buff, "SET NAMES %s", cs_name);

    if (!mysql_query(mysql, buff)) {

    if (!mysql_query(mysql, buff))

    {

      mysql->charset= cs;

    }

  } else {

  }

  else

  {

    char cs_dir_name[FN_REFLEN];

    get_charsets_dir(cs_dir_name);

    mysql->net.last_errno= CR_CANT_READ_CHARSET;

    strmov(mysql->net.sqlstate, unknown_sqlstate);

    my_snprintf(mysql->net.last_error, sizeof(mysql->net.last_error) - 1,

                ER(mysql->net.last_errno),

                cs_name,

                cs_dir_name);

		ER(mysql->net.last_errno), cs_name, cs_dir_name);



  }

  charsets_dir= save_csdir;

  return mysql->net.last_errno;

}





uint STDCALL mysql_thread_safe(void)

{

#ifdef THREAD

man/mysqldump.1.in

+2 −1
Original line number Diff line number Diff line
@@ -218,7 +218,8 @@ or 
), mysqldump will create rows up to net_buffer_length length. If you increase this variable, you should also ensure that the max_allowed_packet variable in the MySQL server is bigger than the net_buffer_length. 

.SH EXAMPLES

.TP

The most normal use of mysqldump is probably for making a backup of whole databases. See Mysql Manual section 21.2 Database Backups. 

The most normal use of mysqldump is probably for making a backup of whole

databases. See the section on Database Backups in the MySQL Reference Manual. 

.TP

mysqldump  \-\-opt \fP\fIdatabase\fP > backup-file.sql

.TP

myisam/mi_key.c

+21 −10
Original line number Diff line number Diff line
@@ -329,8 +329,25 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, 
} /* _mi_pack_key */





	/* Put a key in record */

	/* Used when only-keyread is wanted */



/*

  Store found key in record



  SYNOPSIS

    _mi_put_key_in_record()

    info		MyISAM handler

    keynr		Key number that was used

    record 		Store key here



    Last read key is in info->lastkey



 NOTES

   Used when only-keyread is wanted



 RETURN

   0   ok

   1   error

*/



static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,

				 byte *record)
@@ -341,14 +358,8 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, 
  byte *blob_ptr;

  DBUG_ENTER("_mi_put_key_in_record");



  if (info->s->base.blobs && info->s->keyinfo[keynr].flag & HA_VAR_LENGTH_KEY)

  {

    if (!(blob_ptr=

	  mi_alloc_rec_buff(info, info->s->keyinfo[keynr].keylength,

			    &info->rec_buff)))

      goto err;

  }

  key=(byte*) info->lastkey;

  blob_ptr= info->lastkey2;                     /* Place to put blob parts */

  key=(byte*) info->lastkey;                    /* KEy that was read */

  key_end=key+info->lastkey_length;

  for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)

  {

mysql-test/include/have_outfile.inc

0 → 100644
+5 −0
Original line number Diff line number Diff line 
-- require r/have_outfile.require

disable_query_log;

select load_file(concat(@tmpdir,"/outfile.test"));

--exec rm $MYSQL_TEST_DIR/var/tmp/outfile.test

enable_query_log;

mysql-test/include/test_outfile.inc

0 → 100644
+1 −0
Original line number Diff line number Diff line 
eval select "Outfile OK" into outfile "$MYSQL_TEST_DIR/var/tmp/outfile.test";