diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-10 18:44:40 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-10 18:44:40 +0100 |
| commit | b25bf95fc8625ccd56018a652339132f17f63813 (patch) | |
| tree | c25926216c88e27ffb5b313e9a58df85d4c1d047 /mysql-test/r/log_tables.result | |
| parent | f97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e (diff) | |
| parent | a41b47631430856ec0916a8398550a6fe057a737 (diff) | |
| download | mariadb-git-b25bf95fc8625ccd56018a652339132f17f63813.tar.gz | |
Merge mysql.com:/misc/mysql/31700/50-31700
into mysql.com:/misc/mysql/31700/51-31700
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
manual merge
Diffstat (limited to 'mysql-test/r/log_tables.result')
0 files changed, 0 insertions, 0 deletions