diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 15:24:29 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 15:24:29 -0700 |
| commit | 948a89432738e4d3b9c4d2f8287573f97e81ecb3 (patch) | |
| tree | 2e163bcaefab8eeba55ac25ca6707e3181740da8 /mysql-test/r/mysqldump.result | |
| parent | 45a5ca85f35d1c13528140b449a27d6b2a47d09d (diff) | |
| parent | 61d5563ba413c18b2674e97016093c082b9918d0 (diff) | |
| download | mariadb-git-948a89432738e4d3b9c4d2f8287573f97e81ecb3.tar.gz | |
Merge zim.(none):/home/brian/mysql/dep-5.0
into zim.(none):/home/brian/mysql/dep-5.1
client/mysql.cc:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/sort.c:
Auto merged
mysql-test/r/mysqldump.result:
Fixing Result
mysql-test/r/repair.result:
Fixing result
mysql-test/t/mysqldump.test:
Merging change
storage/archive/ha_archive.cc:
Merging in change
Diffstat (limited to 'mysql-test/r/mysqldump.result')
| -rw-r--r-- | mysql-test/r/mysqldump.result | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 33068cdfc2b..e7573ba48d9 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -2914,7 +2914,7 @@ drop view v1; drop table t1; drop database mysqldump_dbb; use test; -create user mysqltest_1; +create user mysqltest_1@localhost; create table t1(a int, b varchar(34)); reset master; mysqldump: Couldn't execute 'FLUSH TABLES': Access denied; you need the RELOAD privilege for this operation (1227) @@ -2923,6 +2923,13 @@ grant RELOAD on *.* to mysqltest_1@localhost; mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227) mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227) grant REPLICATION CLIENT on *.* to mysqltest_1@localhost; +CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=537; +CREATE TABLE `t1` ( + `a` int(11) default NULL, + `b` varchar(34) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; +drop table t1; +drop user mysqltest_1@localhost; drop table t1; drop user mysqltest_1; End of 5.0 tests |