diff options
| author | unknown <serg@serg.mylan> | 2004-11-15 19:27:06 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-15 19:27:06 +0100 |
| commit | 03d82a4652c82fb1930e0e515877e8fffbb0e5b0 (patch) | |
| tree | f8bc0b4f9899e5b4a5f848426d4568de1213e64b /mysql-test/t/rpl_timezone.test | |
| parent | f3f73a48df66247e8c155fa429aeb1c42b2e7a55 (diff) | |
| parent | a59b0fbfd6b7627a4fdf2233482e732480dbe437 (diff) | |
| download | mariadb-git-03d82a4652c82fb1930e0e515877e8fffbb0e5b0.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
dbug/dbug.c:
Auto merged
include/my_dbug.h:
Auto merged
include/my_sys.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_isam.cc:
Auto merged
sql/ha_isammrg.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_select.cc:
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..ebb58a9c880 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 1387 set global time_zone='MET'; # Clean up |