diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-12-18 16:23:15 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-12-18 16:23:15 +0200 |
| commit | 765caec21ab2093869b3004562582f3357b7f0c4 (patch) | |
| tree | 06750a708d341a95ddae13a126cd65cf86965249 /mysys/my_getsystime.c | |
| parent | fcc1cc8ab510f67838ac9fd1009ec95396bc8c7a (diff) | |
| parent | 630169c6d896bd33b65866d91f2bd8894b79bfa1 (diff) | |
| download | mariadb-git-765caec21ab2093869b3004562582f3357b7f0c4.tar.gz | |
Merge jani@marvel:/my/bk/mysql-maria.new
into hynda.mysql.fi:/home/my/mysql-maria
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/binlog_unsafe.result:
Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Auto merged
mysys/my_write.c:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
include/my_base.h:
Manual merge. New error code.
Diffstat (limited to 'mysys/my_getsystime.c')
0 files changed, 0 insertions, 0 deletions