diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-04 08:23:57 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-04 08:23:57 +0300 |
| commit | 08526ba32d9f4c353640b928edfdde862efc8596 (patch) | |
| tree | ab63127fecca420ce57c76f7e3b5903ee4138d91 /mysql-test/r/isam.result | |
| parent | f0409fa920c7908f2f9ef03919583a32bf84eaad (diff) | |
| download | mariadb-git-08526ba32d9f4c353640b928edfdde862efc8596.tar.gz | |
Changes for new binary .frm format
Fixes after last merge from 4.0.
(Code not yet complete, need anoter merge from 4.0)
heap/hp_write.c:
cleanup
myisam/ft_boolean_search.c:
Fixed tree handling to new format
mysql-test/r/alter_table.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/func_math.result:
Updated results
mysql-test/r/heap_btree.result:
Portability fix
mysql-test/r/isam.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/show_check.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/t/heap_btree.test:
Portability fix
mysql-test/t/show_check.test:
SHOW FULL COLUMN FROM TABLE now returns comment
sql/field.cc:
Fix for comment handling
sql/field.h:
Added CHARSET_INFO to field structure
sql/item_cmpfunc.cc:
Fixed like to use system charset (need to be updated)
sql/item_func.cc:
Update to new charset handling
sql/mysql_priv.h:
cleanup
sql/sql_base.cc:
Added charset to HA_CREATE_INFO
sql/sql_delete.cc:
Added charset to HA_CREATE_INFO
sql/sql_parse.cc:
Added charset to HA_CREATE_INFO
sql/sql_select.cc:
cleanup
sql/sql_show.cc:
charset change
sql/sql_string.h:
cleanup
sql/sql_table.cc:
cleanup
sql/sql_yacc.yy:
Go back to old code for ALTER table ... MODIFY
sql/table.cc:
fixed comment handling
sql/unireg.cc:
new field format
Diffstat (limited to 'mysql-test/r/isam.result')
| -rw-r--r-- | mysql-test/r/isam.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index d19352aad42..5cb218dc4ce 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -67,10 +67,10 @@ a int(11) PRI 0 b int(11) MUL 0 c int(11) 0 show full columns from t1; -Field Type Null Key Default Extra Privileges -a int(11) PRI 0 select,insert,update,references -b int(11) MUL 0 select,insert,update,references -c int(11) 0 select,insert,update,references +Field Type Null Key Default Extra Privileges Comment +a int(11) PRI 0 select,insert,update,references +b int(11) MUL 0 select,insert,update,references +c int(11) 0 select,insert,update,references show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 0 PRIMARY 1 a A 4 NULL NULL BTREE |