diff options
| author | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
| commit | 47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50 (patch) | |
| tree | 85bce6df7d0ce9d809ff3fc13fa4486590463d00 /mysql-test/r/rpl_charset.result | |
| parent | afbe601302fc59c498437321b296ed6c8d360564 (diff) | |
| download | mariadb-git-47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50.tar.gz | |
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
Diffstat (limited to 'mysql-test/r/rpl_charset.result')
| -rw-r--r-- | mysql-test/r/rpl_charset.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result index 03a09b51fd7..2ffdb2c720a 100644 --- a/mysql-test/r/rpl_charset.result +++ b/mysql-test/r/rpl_charset.result @@ -200,8 +200,8 @@ hex(c1) hex(c2) CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 stop slave; delete from t1; -change master to master_log_pos=5801; -start slave until master_log_file='master-bin.000001', master_log_pos=5937; +change master to master_log_pos=6763; +start slave until master_log_file='master-bin.000001', master_log_pos=6921; start slave; select hex(c1), hex(c2) from t1; hex(c1) hex(c2) |