diff options
author | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
commit | 5db2d195a653d913b4b0adf741df79151ca2a5a6 (patch) | |
tree | 7230fe81c62fa6a2bc488216ab3775d11795f3a5 /mysql-test/r/alter_table.result | |
parent | 15b89bfc5981ad348220fbf3f7067b7465d71080 (diff) | |
parent | b5819094a70fa1c4f9c231424af6792da0b7b801 (diff) | |
download | mariadb-git-5db2d195a653d913b4b0adf741df79151ca2a5a6.tar.gz |
merge 3.23 -> 4.0, 2003/02/06
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/func_math.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/alter_table.result')
-rw-r--r-- | mysql-test/r/alter_table.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index 7ade3313abe..b32e100df55 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -350,3 +350,11 @@ t1 0 PRIMARY 1 Host A NULL NULL NULL BTREE t1 0 PRIMARY 2 User A 0 NULL NULL BTREE t1 1 Host 1 Host A NULL NULL NULL BTREE disabled DROP TABLE t1; +name +current +name +mysqltest +name +current +name +mysqltest |