diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-12 12:50:02 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-12 12:50:02 +0300 |
| commit | 239b385933864bff3694f95ccc9d0c645f6a0aad (patch) | |
| tree | 30b412b9ebad3ddaa08bcf7eb478c89eeebc2ed2 /mysql-test/r/timezone3.result | |
| parent | c4879fe6dde9890496a6555e78fa9bde5e21f8f4 (diff) | |
| parent | d2667d1a6ebe7feeb8b80fcc5cfefac80ed729b0 (diff) | |
| download | mariadb-git-239b385933864bff3694f95ccc9d0c645f6a0aad.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
client/mysqldump.c:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/my_malloc.c:
Auto merged
mysys/my_static.c:
Auto merged
mysys/safemalloc.c:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql-common/client.c:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/my_time.c:
Auto merged
mysql-test/r/sp.result:
Merged from main 5.0
sql/sql_load.cc:
Merged from main 5.0
Diffstat (limited to 'mysql-test/r/timezone3.result')
0 files changed, 0 insertions, 0 deletions