diff options
| author | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
| commit | 7f6f31ae73674eb65f4881608b22c843efc23179 (patch) | |
| tree | 751108ce077ef66187d4c557a01975a26665d188 /sql/protocol.cc | |
| parent | 21332fe0a0b510d7b5f5f171a41cbede1965c623 (diff) | |
| parent | ddc3586495aa82f310b0e5c2127b77f28c711c27 (diff) | |
| download | mariadb-git-7f6f31ae73674eb65f4881608b22c843efc23179.tar.gz | |
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
client/mysqltest.c:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/timezone_grant.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/timezone_grant.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
Manual merge
mysql-test/r/olap.result:
Manual merge
mysql-test/t/olap.test:
Manual merge
mysql-test/t/select.test:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/protocol.cc')
0 files changed, 0 insertions, 0 deletions