diff options
author | unknown <monty@mysql.com> | 2005-01-18 04:03:26 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-01-18 04:03:26 +0200 |
commit | 7aecbab85c5059c9d1f89188d30ac2c0dbae3ca6 (patch) | |
tree | bb697cb498858b14ae0d525938dd3fcd68d13eaa /ndb/test/src/UtilTransactions.cpp | |
parent | 2524517978fe7a3d0f61a67bb7a558663b559cac (diff) | |
parent | 985805ce6afefaf2715732809aa00c5396990662 (diff) | |
download | mariadb-git-7aecbab85c5059c9d1f89188d30ac2c0dbae3ca6.tar.gz |
Merge with global tree
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/order_by.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/order_by.test:
Merge
sql/sql_lex.cc:
Merge
sql/sql_yacc.yy:
Use local copy
Diffstat (limited to 'ndb/test/src/UtilTransactions.cpp')
0 files changed, 0 insertions, 0 deletions