diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-13 19:45:36 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-13 19:45:36 +0200 |
| commit | ac0cd2d3acd756b6917b7ea57d20ad5ea88b1999 (patch) | |
| tree | ef0605aeb29c8a09b24a3c1988d69549494a8fab /sql/net_serv.cc | |
| parent | 7281d2e3ae7665f442dc07124b365b5fae190a24 (diff) | |
| parent | 8d71bcec217bead7d832d6ea4dca437c5f134577 (diff) | |
| download | mariadb-git-ac0cd2d3acd756b6917b7ea57d20ad5ea88b1999.tar.gz | |
marge
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/mysql_priv.h:
merge
sql/sql_parse.cc:
merge
sql/sql_show.cc:
merge
Diffstat (limited to 'sql/net_serv.cc')
0 files changed, 0 insertions, 0 deletions