diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:28:23 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:28:23 +0200 |
| commit | a48380cd9a29a67cb161ffc0a9b7a037efe04297 (patch) | |
| tree | 986db555a436ebf570733597877d21e2ffa95d36 /README | |
| parent | 26252fa28bfa0c2dcf7d7b47cba51f47b30b2eb7 (diff) | |
| parent | 1665d2370716a44acf7d35339019ad5b9e134b99 (diff) | |
| download | mariadb-git-a48380cd9a29a67cb161ffc0a9b7a037efe04297.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
client/mysqlimport.c:
Auto merged
include/config-netware.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
netware/mysqld_safe.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Merged from 4.1.
sql/sql_base.cc:
Merged from 4.1.
sql/sql_handler.cc:
Merged from 4.1.
sql/sql_select.cc:
Merged from 4.1.
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions