diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-20 16:11:16 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-20 16:11:16 +0300 |
| commit | 0a929c5e6eb5042400a154fc01cae524f7d2e0a5 (patch) | |
| tree | b5b93396b554d77b8cadae7610977be000865b1d /mysql-test/t/rpl_timezone.test | |
| parent | 6853eb45c8085480643af94734a042b9c4c5b939 (diff) | |
| parent | e3b559938c1a739add9ad1dd2e5c62b8e10ade96 (diff) | |
| download | mariadb-git-0a929c5e6eb5042400a154fc01cae524f7d2e0a5.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_timezone.test')
| -rw-r--r-- | mysql-test/t/rpl_timezone.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_timezone.test b/mysql-test/t/rpl_timezone.test index 8dff90a84cf..03e910cd7ca 100644 --- a/mysql-test/t/rpl_timezone.test +++ b/mysql-test/t/rpl_timezone.test @@ -76,7 +76,7 @@ select * from t2; # replication # connection master; ---error 1105 +--error 1386 set global time_zone='MET'; # Clean up |