diff options
author | unknown <monty@mysql.com> | 2004-11-12 19:58:24 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-11-12 19:58:24 +0200 |
commit | 43779eeb956f2b36b6d093dca046537fd07891f9 (patch) | |
tree | e0dd750287073966f1595d8099b4cc23faa803f7 /ltmain.sh | |
parent | 94c79d07067e384e9a6a6ecf7a58987c6714026c (diff) | |
parent | 56150038b76d29af7ed7fbeba4b47ccfcffaa6fa (diff) | |
download | mariadb-git-43779eeb956f2b36b6d093dca046537fd07891f9.tar.gz |
Merge with 4.1
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Auto merged
BitKeeper/deleted/.del-Makefile.am~1:
Delete: Docs/Images/Makefile.am
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/time.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
configure.in:
Merge with 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
Merge with 4.0
mysys/default.c:
Merge with 4.1 (to get new extension handling)
sql/log.cc:
Merge with 4.0
tests/client_test.c:
Merge with 4.1 (to get possibility to run any tests)
Diffstat (limited to 'ltmain.sh')
0 files changed, 0 insertions, 0 deletions