database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  zim.(none):/home/brian/mysql/cluster-5.1


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2005-12-22 01:12:40 -08:00
parent 973949d0b3 67c96c78f5
commit 69221bba59
9 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/information_schema.result
View File

@ -41,6 +41,7 @@ COLLATIONS
COLLATION_CHARACTER_SET_APPLICABILITY
COLUMNS
COLUMN_PRIVILEGES
ENGINES
KEY_COLUMN_USAGE
PLUGINS
ROUTINES
@ -1058,3 +1059,6 @@ where table_name="v1";
table_type
VIEW
drop view v1;
select * from information_schema.engines WHERE ENGINE="MyISAM";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
MyISAM ENABLED Default engine as of MySQL 3.23 with great performance NO NO NO

1
mysql-test/r/information_schema_db.result
View File

@ -6,6 +6,7 @@ COLLATIONS
COLLATION_CHARACTER_SET_APPLICABILITY
COLUMNS
COLUMN_PRIVILEGES
ENGINES
KEY_COLUMN_USAGE
PLUGINS
ROUTINES

6
mysql-test/t/information_schema.test
View File

@ -748,3 +748,9 @@ drop table t1;
select table_type from information_schema.tables
where table_name="v1";
drop view v1;
#
# Show engines
#
select * from information_schema.engines WHERE ENGINE="MyISAM";