Commit c06d233d authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files

Merge gleb.loc:/home/uchum/work/bk/5.0 

into  gleb.loc:/home/uchum/work/bk/5.0-opt
parents b066c120 7a249187

client/mysql.cc

+6 −1
Original line number Diff line number Diff line
@@ -1086,6 +1086,11 @@ static int read_and_execute(bool interactive) 
           something else is still in console input buffer

        */

      } while (tmpbuf.alloced_length() <= clen);

      /* 

        An empty line is returned from my_cgets when there's error reading :

        Ctrl-c for example

      */

      if (line)

        line= buffer.c_ptr();

#else /* OS2 */

      buffer.length(0);

client/mysqldump.c

+1 −2
Original line number Diff line number Diff line
@@ -3673,10 +3673,9 @@ static my_bool get_view_structure(char *table, char* db) 
            result_table);

    check_io(sql_file);

  }

  fprintf(sql_file, "/*!50001 DROP TABLE %s*/;\n", opt_quoted_table);

  if (opt_drop)

  {

    fprintf(sql_file, "/*!50001 DROP TABLE IF EXISTS %s*/;\n",

            opt_quoted_table);

    fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n",

            opt_quoted_table);

    check_io(sql_file);

include/my_base.h

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ enum ha_base_keytype { 
#define HA_PACK_RECORD		2	/* Request packed record format */

#define HA_CREATE_TMP_TABLE	4

#define HA_CREATE_CHECKSUM	8

#define HA_CREATE_KEEP_FILES	16      /* don't overwrite .MYD and MYI */

#define HA_CREATE_DELAY_KEY_WRITE 64



/*

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -4945,7 +4945,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) 
      Reset stored result set if so was requested or it's a part

      of cursor fetch.

    */

    if (result->data && (flags & RESET_STORE_RESULT))

    if (flags & RESET_STORE_RESULT)

    {

      /* Result buffered */

      free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));

myisam/mi_create.c

+2 −2
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
					     32 : 0));

    linkname_ptr=0;

    /* Replace the current file */

    create_flag=MY_DELETE_OLD;

    create_flag=(flags & HA_CREATE_KEEP_FILES) ? 0 : MY_DELETE_OLD;

  }



  /*
@@ -647,7 +647,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
      {

	fn_format(filename,name,"",MI_NAME_DEXT,4);

	linkname_ptr=0;

	create_flag=MY_DELETE_OLD;

        create_flag=(flags & HA_CREATE_KEEP_FILES) ? 0 : MY_DELETE_OLD;

      }

      if ((dfile=

	   my_create_with_symlink(linkname_ptr, filename, 0, create_mode,