Commit 1aa9d478 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents b1fdece3 c5a33802

libmysql/libmysql.c

+4 −3
Original line number Diff line number Diff line
@@ -4680,15 +4680,16 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) 
  MYSQL_DATA *result= &stmt->result;

  MYSQL_ROWS *cur, **prev_ptr= &result->data;

  NET        *net;

  DBUG_ENTER("cli_read_binary_rows");



  DBUG_ENTER("cli_read_binary_rows");

  

  if (!mysql)

  {

    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);

    return 1;

    DBUG_RETURN(1);

  }



  DBUG_ENTER("cli_read_binary_rows");



  net = &mysql->net;

  mysql= mysql->last_used_con;

mysql-test/include/have_bug25714.inc

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
#

--require r/have_bug25714.require

disable_query_log;

eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe";

eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe";

enable_query_log;

mysql-test/suite/funcs_1/README.txt

+22 −0
Original line number Diff line number Diff line
@@ -110,3 +110,25 @@ Carsten 16.09.2005 
4. Fixed datadict_<engine>.result files after the change that added 2 columns to 

   the VIEWS table (DEFINER varchar(77), SECURITY_TYPE varchar(7)).

===================================================================

Matthias 25.08.2007

-------------------

Fixes for Bugs 30418,30420,30438,30440 

1. Replace error numbers with error names

2. Replace static "InnoDB" (not all time available) used within an

   "alter table" by $OTHER_ENGINE_TYPE (set to MEMORY or MyISAM).

   Minor adjustment of column data type.

3. Use mysqltest result set sorting in several cases.

4. Avoid any statistics about help tables, because their content

   depends on configuration:

   developer release - help tables are empty

   build release     - help tables have content + growing with version

5. Add two help table related tests (one for build, one for developer)

   to ensure that informations about help tables within

   INFORMATION_SCHEMA.TABLES/STATISTICS are checked.

General note:

   Most INFORMATION_SCHEMA properties (table layout, permissions etc.)

   are not affected by our variation of the storage engines except

   that some properties of our tables using a specific storage

   engine become visible. So it makes sense to decompose

   this test into a storage engine specific part and a non

   storage engine specific part in future.

mysql-test/suite/funcs_1/datadict/datadict_master.inc

+242 −206

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/funcs_1/r/datadict_help_tables_build.result

0 → 100644
+22 −0
Original line number Diff line number Diff line 
DELETE FROM mysql.help_category LIMIT <number>;

DELETE FROM mysql.help_keyword LIMIT <number>;

DELETE FROM mysql.help_relation LIMIT <number>;

DELETE FROM mysql.help_topic LIMIT <number>;

SELECT * FROM INFORMATION_SCHEMA.TABLES

WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT

NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	30	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories

NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	320	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords

NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	640	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation

NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	380	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics

SELECT * FROM INFORMATION_SCHEMA.STATISTICS

WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE 'help_%';

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLUMN_NAME	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT

NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	30	NULL	NULL		BTREE	

NULL	mysql	help_category	0	mysql	name	1	name	A	30	NULL	NULL		BTREE	

NULL	mysql	help_keyword	0	mysql	PRIMARY	1	help_keyword_id	A	320	NULL	NULL		BTREE	

NULL	mysql	help_keyword	0	mysql	name	1	name	A	320	NULL	NULL		BTREE	

NULL	mysql	help_relation	0	mysql	PRIMARY	1	help_keyword_id	A	NULL	NULL	NULL		BTREE	

NULL	mysql	help_relation	0	mysql	PRIMARY	2	help_topic_id	A	640	NULL	NULL		BTREE	

NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	380	NULL	NULL		BTREE	

NULL	mysql	help_topic	0	mysql	name	1	name	A	380	NULL	NULL		BTREE