diff options
| author | unknown <monty@mysql.com> | 2003-12-19 16:34:48 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-19 16:34:48 +0200 |
| commit | de8b2bbd301a17a7a02ea62cff806950071dfbce (patch) | |
| tree | 05b144ca850fc0bb99c1922907bfb2e9ba19fc77 /sql/sql_client.cc | |
| parent | 5372bc432d3ecc476c777d24dd393a9f2c51ea4d (diff) | |
| parent | c9f5145abb9815220b51a9707c6ede0c77b3e1f0 (diff) | |
| download | mariadb-git-de8b2bbd301a17a7a02ea62cff806950071dfbce.tar.gz | |
merge
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
sql/field.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_client.cc')
| -rw-r--r-- | sql/sql_client.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_client.cc b/sql/sql_client.cc index 9f3063cde2d..49d0d3087ad 100644 --- a/sql/sql_client.cc +++ b/sql/sql_client.cc @@ -37,4 +37,3 @@ void my_net_local_init(NET *net) #endif } } - |