Portability fixes

mysql-test/r/show_check.result:
  Updated results
mysql-test/t/show_check.test:
  Portability fix (for 64 bit platforms)
mysys/hash.c:
  Portablity fix
sql/gen_lex_hash.cc:
  Don't include mysql_priv.h;  Causes build errors on a lot of platforms
sql/lex_symbol.h:
  Moved symbols here from mysql_priv.h to avoid including mysql_priv.h in gen_lex_hash.cc
sql/mysql_priv.h:
  Move symbols and struct to lex_symbol.h
sql/sql_db.cc:
  Don't use sql_alloc/sql_free methods in sql_string.h
sql/sql_help.cc:
  Don't use sql_alloc/sql_free methods in sql_string.h
sql/sql_string.h:
  Don't use sql_alloc/sql_free methods in sql_string.h
  This makes the code faster and more portable
sql/sql_yacc.yy:
  Don't use sql_alloc/sql_free methods in sql_string.h

2 files changed, 28 insertions, 21 deletions

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 6a08dca213c..828964d7543 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -335,55 +335,55 @@ insert into t2 values (1),(2);
 insert into t3 values (1,1),(2,2);
 show table status;
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	HEAP	Fixed	2	5	39904	249415	42	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	Fixed	2	5	39904	249415	39904	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	Fixed	2	9	33072	248103	22090	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	Fixed	2	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	Fixed	2	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	Fixed	2	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 insert into t1 values (3),(4);
 insert into t2 values (3),(4);
 insert into t3 values (3,3),(4,4);
 show table status;
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	HEAP	Fixed	4	5	39904	249415	84	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	Fixed	4	5	39904	249415	39904	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	Fixed	4	9	33072	248103	22132	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	Fixed	4	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	Fixed	4	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	Fixed	4	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 insert into t1 values (5);
 insert into t2 values (5);
 insert into t3 values (5,5);
 show table status;
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	HEAP	Fixed	5	5	39904	249415	105	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	Fixed	5	5	39904	249415	39904	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	Fixed	5	9	33072	248103	22153	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	Fixed	5	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	Fixed	5	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	Fixed	5	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 delete from t1 where a=3;
 delete from t2 where b=3;
 delete from t3 where a=3;
 show table status;
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	HEAP	Fixed	4	5	39904	249415	89	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	Fixed	4	5	39904	249415	39904	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	Fixed	4	9	33072	248103	22137	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	Fixed	4	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	Fixed	4	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	Fixed	4	9	#	#	#	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 delete from t1;
 delete from t2;
 delete from t3;
 show table status;
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	HEAP	Fixed	0	5	0	249415	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	Fixed	0	5	0	249415	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	Fixed	0	9	0	248103	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	Fixed	0	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	Fixed	0	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	Fixed	0	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 insert into t1 values (5);
 insert into t2 values (5);
 insert into t3 values (5,5);
 show table status;
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	HEAP	Fixed	1	5	39904	249415	21	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	Fixed	1	5	39904	249415	39904	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	Fixed	1	9	33072	248103	22069	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	Fixed	1	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	Fixed	1	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	Fixed	1	9	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 delete from t1 where a=5;
 delete from t2 where b=5;
 delete from t3 where a=5;
 show table status;
 Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	HEAP	Fixed	0	5	39904	249415	5	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	Fixed	0	5	39904	249415	39904	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	Fixed	0	9	33072	248103	22053	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	Fixed	0	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	Fixed	0	5	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	Fixed	0	9	#	#	#	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 drop table t1, t2, t3;
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 935e472c4a1..81cd024e4b3 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -209,30 +209,37 @@ CREATE TABLE t3 (
 insert into t1 values (1),(2);
 insert into t2 values (1),(2);
 insert into t3 values (1,1),(2,2);
+--replace_column 6 # 7 # 8 #
 show table status;
 insert into t1 values (3),(4);
 insert into t2 values (3),(4);
 insert into t3 values (3,3),(4,4);
+--replace_column 6 # 7 # 8 #
 show table status;
 insert into t1 values (5);
 insert into t2 values (5);
 insert into t3 values (5,5);
+--replace_column 6 # 7 # 8 #
 show table status;
 delete from t1 where a=3;
 delete from t2 where b=3;
 delete from t3 where a=3;
+--replace_column 6 # 7 # 8 #
 show table status;
 delete from t1;
 delete from t2;
 delete from t3;
+--replace_column 6 # 7 # 8 #
 show table status;
 insert into t1 values (5);
 insert into t2 values (5);
 insert into t3 values (5,5);
+--replace_column 6 # 7 # 8 #
 show table status;
 delete from t1 where a=5;
 delete from t2 where b=5;
 delete from t3 where a=5;
+--replace_column 6 # 7 # 8 #
 show table status;
 
 drop table t1, t2, t3;