diff options
| author | unknown <serg@serg.mylan> | 2006-06-15 23:50:32 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-06-15 23:50:32 +0200 |
| commit | 2996b49af72ab0ceef02c13ef5279e59ae9e4eeb (patch) | |
| tree | b5c79e1231ba36599e21abe8562b3dff5e5c4cb1 /sql/protocol.cc | |
| parent | 9b402b909b22d97f5809f73eb1e57229cc9ce572 (diff) | |
| parent | 1c91ec45568c168871b3c0f7e149112b97b49e8b (diff) | |
| download | mariadb-git-2996b49af72ab0ceef02c13ef5279e59ae9e4eeb.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/m51
mysql-test/r/ctype_sjis.result:
Auto merged
mysql-test/t/ctype_sjis.test:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/protocol.cc')
0 files changed, 0 insertions, 0 deletions