diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
| commit | 8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62 (patch) | |
| tree | f4c99a6c2b4ed9003c893e7098a0c957d720e317 /mysql-test/r/rpl_log.result | |
| parent | 95e772b65678b182bff5b52f3f5386d894419147 (diff) | |
| download | mariadb-git-8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62.tar.gz | |
Update after last merge. Fixes some wrong test results.
libmysql/libmysql.c:
Removed obsolete function (now in strings library)
mysql-test/r/rpl_log.result:
Updated results for 4.1
mysql-test/r/rpl_log_pos.result:
Updated results for 4.1
sql/item_strfunc.cc:
Added missing system_charset_info
sql/log_event.cc:
Portability fixes. More debugging.
sql/net_pkg.cc:
Added back setting of query_error as slave code is depeneding on this.
sql/sql_acl.cc:
Update after last merge
sql/sql_lex.cc:
Update after last merge
sql/sql_parse.cc:
Update after last merge
sql/sql_prepare.cc:
Update after last merge
sql/time.cc:
Update after last merge.
More comments
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 01efce20e1d..b6e1419b466 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -71,20 +71,20 @@ slave-bin.002 show binlog events in 'slave-bin.001' from 4; Log_name Pos Event_type Server_id Orig_log_pos Info slave-bin.001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3 -slave-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +slave-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) slave-bin.001 172 Intvar 1 200 INSERT_ID=1 -slave-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) -slave-bin.001 263 Query 1 263 use test; drop table t1 -slave-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) +slave-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) +slave-bin.001 263 Query 1 263 use `test`; drop table t1 +slave-bin.001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) slave-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81 slave-bin.001 565 Exec_load 1 556 ;file_id=1 -slave-bin.001 588 Query 1 579 use test; drop table t1 +slave-bin.001 588 Query 1 579 use `test`; drop table t1 slave-bin.001 636 Rotate 2 636 slave-bin.002;pos=4 show binlog events in 'slave-bin.002' from 4; Log_name Pos Event_type Server_id Orig_log_pos Info -slave-bin.002 57 Query 1 4 use `test`; create table t1 (n int) -slave-bin.002 115 Query 1 62 use `test`; insert into t1 values (1) -slave-bin.002 175 Query 1 122 use `test`; drop table t1 +slave-bin.002 4 Query 1 4 use `test`; create table t1 (n int) +slave-bin.002 62 Query 1 62 use `test`; insert into t1 values (1) +slave-bin.002 122 Query 1 122 use `test`; drop table t1 show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 127.0.0.1 root MASTER_PORT 1 master-bin.002 170 slave-relay-bin.002 957 master-bin.002 Yes Yes 0 0 170 961 |