Commit e5d8e72a authored by unknown's avatar unknown
Browse files

After merge fixes 


innobase/mem/mem0pool.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
configure.in:
  Ignore changes that were backported to 4.0
scripts/mysql_install_db.sh:
  Ignore Ramil's changes for now
parents 99620cec af39ee00

sql/ha_innodb.cc

+9 −9
Original line number Diff line number Diff line
@@ -4672,12 +4672,12 @@ ha_innobase::update_table_comment( 
		dict_print_info_on_foreign_keys(FALSE, file,

				prebuilt->trx, prebuilt->table);

		flen = ftell(file);

		if(length + flen + 3 > 64000) {

		if (flen < 0) {

			flen = 0;

		} else if (length + flen + 3 > 64000) {

			flen = 64000 - 3 - length;

		}



		ut_ad(flen > 0);



		/* allocate buffer for the full string, and

		read the contents of the temporary file */
@@ -4741,12 +4741,12 @@ ha_innobase::get_foreign_key_create_info(void) 
		prebuilt->trx->op_info = (char*)"";



		flen = ftell(file);

		if(flen > 64000 - 1) {

		if (flen < 0) {

			flen = 0;

		} else if(flen > 64000 - 1) {

			flen = 64000 - 1;

		}



		ut_ad(flen >= 0);



		/* allocate buffer for the string, and

		read the contents of the temporary file */
@@ -5142,12 +5142,12 @@ innodb_show_status( 
	srv_printf_innodb_monitor(srv_monitor_file);

	flen = ftell(srv_monitor_file);

	os_file_set_eof(srv_monitor_file);

	if(flen > 64000 - 1) {

	if (flen < 0) {

		flen = 0;

	} else if (flen > 64000 - 1) {

		flen = 64000 - 1;

	}



	ut_ad(flen > 0);



	/* allocate buffer for the string, and

	read the contents of the temporary file */