diff options
| author | unknown <monty@nosik.monty.fi> | 2007-07-23 20:39:53 +0300 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2007-07-23 20:39:53 +0300 |
| commit | dafcbfa8dec0a9e0022a620bb4847a1baca3193e (patch) | |
| tree | 589e6d7e4f3cdb8a80432797ac5ec4d74037026e /sql/sql_connect.cc | |
| parent | 9e9f196b2d9a7366dd724aa98d4858a9de6b4d8c (diff) | |
| parent | 6c1998dfe51c68517604781be94ea007743b7637 (diff) | |
| download | mariadb-git-dafcbfa8dec0a9e0022a620bb4847a1baca3193e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_conio.c:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/stacktrace.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'sql/sql_connect.cc')
0 files changed, 0 insertions, 0 deletions