diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
| commit | 20e0b90a148b8c2a375c38818234151092f9f12d (patch) | |
| tree | 2cc4962b85af835d461cb0c5c5759ff69ea5b687 /sql/sql_select.cc | |
| parent | f21d65683ee1a2985103246db213214d2da36f87 (diff) | |
| parent | a7ff6e90925a779e83e6498423b72f315232f768 (diff) | |
| download | mariadb-git-20e0b90a148b8c2a375c38818234151092f9f12d.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31177/50-31177
client/mysql.cc:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
0 files changed, 0 insertions, 0 deletions