Commit ebbee9d9 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


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 1c234737 87b40f20

BitKeeper/etc/gone

+9 −0
Original line number Diff line number Diff line
@@ -457,6 +457,14 @@ ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|200103271 
ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456

jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec

jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554

jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa

jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aajimw@mysql.com|mysql-test/t/ndb_autodiscover2.disabled|20050311230559|22363|afa8e5b6e46a3ea1jimw@mysql.com|mysql-test/t/ndb_autodiscover.disabled|20050311230559|58101|dda20d04dddbb06jimw@mysql.com|mysql-test/t/ndb_cache_multi2.disabled|20050311230600|47901|84fed1a78c0d3e6djimw@mysql.com|mysql-test/t/ndb_cache_multi.disabled|20050311230600|18039|9657b6eff7deb27ajimw@mysql.com|mysql-test/t/ndb_multi.disabled|20050311230600|12240|2599367ad06100f6jimw@mysql.com|mysql-test/t/ndb_restore.disabled|20050311230600|30718|3c2453d6164b1a30jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aajimw@mysql.com|mysql-test/t/ndb_autodiscover2.disabled|20050311230559|22363|afa8e5b6e46a3ea1jimw@mysql.com|mysql-test/t/ndb_autodiscover.disabled|20050311230559|58101|dda20d04dddbb06jimw@mysql.com|mysql-test/t/ndb_cache_multi2.disabled|20050311230600|47901|84fed1a78c0d3e6djimw@mysql.com|mysql-test/t/ndb_cache_multi.disabled|20050311230600|18039|9657b6eff7deb27ajimw@mysql.com|mysql-test/t/ndb_multi.disabled|20050311230600|12240|2599367ad06100f6jimw@mysql.com|mysql-test/t/ndb_restore.disabled|20050311230600|30718|3c2453d6164b1a30magnus@neptunus.(none)|ndb/src/client/Makefile|20040414084436|02010|6c2778d2bf4954a2

jimw@mysql.com|mysql-test/t/ndb_autodiscover.disabled|20050311230559|58101|dda20d04dddbb06

jimw@mysql.com|mysql-test/t/ndb_autodiscover2.disabled|20050311230559|22363|afa8e5b6e46a3ea1

jimw@mysql.com|mysql-test/t/ndb_cache_multi.disabled|20050311230600|18039|9657b6eff7deb27a

jimw@mysql.com|mysql-test/t/ndb_cache_multi2.disabled|20050311230600|47901|84fed1a78c0d3e6d

jimw@mysql.com|mysql-test/t/ndb_multi.disabled|20050311230600|12240|2599367ad06100f6

jimw@mysql.com|mysql-test/t/ndb_restore.disabled|20050311230600|30718|3c2453d6164b1a30

magnus@neptunus.(none)|ndb/src/client/Makefile|20040414084436|02010|6c2778d2bf4954a2

magnus@neptunus.(none)|ndb/src/client/odbc/Extra.mk|20040414082358|47442|eabbb28986ca817d

magnus@neptunus.(none)|ndb/src/client/odbc/Makefile|20040414084435|33394|9bc928a18aa88d66
@@ -1174,6 +1182,7 @@ mwagner@evoq.home.mwagner.org|mysql-test/xml/xsl/README|20001013051514|26509|cd4 
mwagner@evoq.home.mwagner.org|mysql-test/xml/xsl/mysqltest.xsl|20001013051514|27425|1b8f6ec4f1b5f634

mwagner@work.mysql.com|mysql-test/r/3.23/sel000001.result|20001010091454|28284|383913ae4505ec86

mwagner@work.mysql.com|mysql-test/r/3.23/sel000002.result|20001010091454|29230|d1787e6fd5dbc1cc

ndb/src/client/Makefile

nick@nick.leippe.com|mysql-test/r/rpl_empty_master_crash.result|20020531235552|47718|615f521be2132141

nick@nick.leippe.com|mysql-test/t/rpl_empty_master_crash.test|20020531235552|52328|99464e737639ccc6

sasha@mysql.sashanet.com|BitKeeper/etc/logging_ok|20000801000905|12967|5b7d847a2158554

innobase/fil/fil0fil.c

+7 −7
Original line number Diff line number Diff line
@@ -2621,12 +2621,12 @@ fil_open_single_table_tablespace( 
		fputs("!\n"

"InnoDB: Have you moved InnoDB .ibd files around without using the\n"

"InnoDB: commands DISCARD TABLESPACE and IMPORT TABLESPACE?\n"

"InnoDB: It is also possible that this is a table created with\n"

"InnoDB: CREATE TEMPORARY TABLE, and MySQL removed the .ibd file for this.\n"

"InnoDB: It is also possible that this is a temporary table #sql...,\n"

"InnoDB: and MySQL removed the .ibd file for this.\n"

"InnoDB: Please refer to\n"

"InnoDB:"

" http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n"

"InnoDB: how to resolve the issue.\n", stderr);

"InnoDB: for how to resolve the issue.\n", stderr);



		mem_free(filepath);
@@ -2666,7 +2666,7 @@ fil_open_single_table_tablespace( 
"InnoDB: Please refer to\n"

"InnoDB:"

" http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n"

"InnoDB: how to resolve the issue.\n", (ulong) space_id, (ulong) id);

"InnoDB: for how to resolve the issue.\n", (ulong) space_id, (ulong) id);



		ret = FALSE;
@@ -3261,7 +3261,7 @@ fil_space_for_table_exists_in_mem( 
			ut_print_filename(stderr, name);

			fprintf(stderr, "\n"

"InnoDB: in InnoDB data dictionary has tablespace id %lu,\n"

"InnoDB: but tablespace with that id does not exist. There is\n"

"InnoDB: but a tablespace with that id does not exist. There is\n"

"InnoDB: a tablespace of name %s and id %lu, though. Have\n"

"InnoDB: you deleted or moved .ibd files?\n",

				(ulong) id, namespace->name,
@@ -3272,7 +3272,7 @@ fil_space_for_table_exists_in_mem( 
"InnoDB: Please refer to\n"

"InnoDB:"

" http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n"

"InnoDB: how to resolve the issue.\n", stderr);

"InnoDB: for how to resolve the issue.\n", stderr);



		mem_free(path);

		mutex_exit(&(system->mutex));
@@ -3286,7 +3286,7 @@ fil_space_for_table_exists_in_mem( 
		ut_print_filename(stderr, name);

		fprintf(stderr, "\n"

"InnoDB: in InnoDB data dictionary has tablespace id %lu,\n"

"InnoDB: but tablespace with that id has name %s.\n"

"InnoDB: but the tablespace with that id has name %s.\n"

"InnoDB: Have you deleted or moved .ibd files?\n", (ulong) id, space->name);



		if (namespace != NULL) {

innobase/include/trx0trx.h

+5 −0
Original line number Diff line number Diff line
@@ -369,6 +369,11 @@ struct trx_struct{ 
	XID		xid;		/* X/Open XA transaction 

					identification to identify a 

					transaction branch */

	ibool		support_xa;	/* normally we do the XA two-phase

					commit steps, but by setting this to

					FALSE, one can save CPU time and about

					150 bytes in the undo log size as then

					we skip XA steps */

	dulint		no;		/* transaction serialization number ==

					max trx id when the transaction is 

					moved to COMMITTED_IN_MEMORY state */

innobase/row/row0mysql.c

+6 −4
Original line number Diff line number Diff line
@@ -3382,8 +3382,9 @@ row_rename_table_for_mysql( 
     	"InnoDB: data dictionary though MySQL is trying to rename the table.\n"

     	"InnoDB: Have you copied the .frm file of the table to the\n"

	"InnoDB: MySQL database directory from another database?\n"

	"InnoDB: You can look for further help from section 15.1 of\n"

        "InnoDB: http://www.innodb.com/ibman.php\n", stderr);

	"InnoDB: You can look for further help from\n"

        "InnoDB: http://dev.mysql.com/doc/mysql/en/"

	"InnoDB_troubleshooting_datadict.html\n", stderr);

		goto funct_exit;

	}
@@ -3395,8 +3396,9 @@ row_rename_table_for_mysql( 
                ut_print_name(stderr, trx, old_name);

                fputs(

	" does not have an .ibd file in the database directory.\n"

	"InnoDB: You can look for further help from section 15.1 of\n"

        "InnoDB: http://www.innodb.com/ibman.php\n", stderr);

	"InnoDB: You can look for further help from\n"

        "InnoDB: http://dev.mysql.com/doc/mysql/en/"

	"InnoDB_troubleshooting_datadict.html\n", stderr);

		goto funct_exit;

	}

innobase/trx/trx0roll.c

+3 −11
Original line number Diff line number Diff line
@@ -441,16 +441,8 @@ trx_rollback_or_clean_all_without_sess( 
			trx = UT_LIST_GET_NEXT(trx_list, trx);

		} else if (trx->conc_state == TRX_PREPARED) {



			/* Roll back all prepared transactions if

			innobase_force_recovery > 0 in my.cnf */



			if (srv_force_recovery > 0) {

				trx->conc_state = TRX_ACTIVE;

				break;

			} else {

			trx->sess = trx_dummy_sess;

			trx = UT_LIST_GET_NEXT(trx_list, trx);

			}

		} else {

			break;

		}
@@ -461,7 +453,7 @@ trx_rollback_or_clean_all_without_sess( 
	if (trx == NULL) {

		ut_print_timestamp(stderr);

		fprintf(stderr,

		"  InnoDB: Rollback of uncommitted transactions completed\n");

		"  InnoDB: Rollback of non-prepared transactions completed\n");



 		mem_heap_free(heap);