Commit 08b3e79e authored by unknown's avatar unknown
Browse files

Merge with global tree 


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/examples/ha_archive.cc:
  Merge with global tree
  (Use my changes)
sql/sql_parse.cc:
  Remove 'tmp' fix to be able to run tests
parents c5d4d50a 248e4494

extra/comp_err.c

+2 −2
Original line number Diff line number Diff line
@@ -332,13 +332,13 @@ static int create_sys_files(struct languages *lang_head, 
    head[30]= csnum;



    my_fseek(to, 0l, MY_SEEK_SET, MYF(0));

    if (my_fwrite(to, head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))

    if (my_fwrite(to, (byte*) head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))

      goto err;



    for (i= 0; i < row_count; i++)

    {

      int2store(head, file_pos[i]);

      if (my_fwrite(to, head, 2, MYF(MY_WME | MY_FNABP)))

      if (my_fwrite(to, (byte*) head, 2, MYF(MY_WME | MY_FNABP)))

	goto err;

    }

    my_fclose(to, MYF(0));

extra/perror.c

+2 −1
Original line number Diff line number Diff line
@@ -250,7 +250,8 @@ int main(int argc,char *argv[]) 
        'Unknown Error' (without regard to case).

      */

      if (msg &&

          my_strnncoll(&my_charset_latin1, msg, 13, "Unknown Error", 13) &&

          my_strnncoll(&my_charset_latin1, (const uchar*) msg, 13,

                       (const uchar*) "Unknown Error", 13) &&

          (!unknown_error || strcmp(msg, unknown_error)))

      {

	found=1;

include/mysys_err.h

+10 −5
Original line number Diff line number Diff line
@@ -26,10 +26,14 @@ extern "C" { 
extern const char * NEAR globerrs[];	/* my_error_messages is here */



/* Error message numbers in global map */

/* Do not add error numbers before EE_ERROR_FIRST. */

/* If necessary to add lower numbers, change EE_ERROR_FIRST accordingly. */

#define EE_ERROR_FIRST          0 /*Copy first error nr.*/

#define EE_FILENOTFOUND		0

/*

  Do not add error numbers before EE_ERROR_FIRST.

  If necessary to add lower numbers, change EE_ERROR_FIRST accordingly.



  We start with error 1 to not confuse peoples with 'error 0'

*/



#define EE_ERROR_FIRST          1 /*Copy first error nr.*/

#define EE_CANTCREATEFILE	1

#define EE_READ			2

#define EE_WRITE		3
@@ -57,7 +61,8 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ 
#define EE_REALPATH		26

#define EE_SYNC			27

#define EE_UNKNOWN_COLLATION	28

#define EE_ERROR_LAST           28 /*Copy last error nr.*/

#define EE_FILENOTFOUND		29

#define EE_ERROR_LAST           29 /*Copy last error nr.*/

/* Add error numbers before EE_ERROR_LAST and change it accordingly. */



  /* exit codes for all MySQL programs */

innobase/dict/dict0dict.c

+1 −1
Original line number Diff line number Diff line
@@ -2472,7 +2472,7 @@ dict_scan_id( 
		my_isspace(). Only after that, convert id names to UTF-8. */



		b = (byte*)(*id);

		id_len = strlen(b);

		id_len = strlen((char*) b);

		

		if (id_len >= 3 && b[id_len - 1] == 0xA0

			       && b[id_len - 2] == 0xC2) {

innobase/dict/dict0load.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ dict_print(void) 


		if (table == NULL) {

			fputs("InnoDB: Failed to load table ", stderr);

			ut_print_namel(stderr, NULL, field, len);

			ut_print_namel(stderr, NULL, (char*) field, len);

			putc('\n', stderr);

		} else {

			/* The table definition was corrupt if there