diff options
| author | unknown <monty@mysql.com> | 2003-12-08 12:26:10 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-08 12:26:10 +0200 |
| commit | 43b42ceee1702fe42e12c1b59a8e97cac3ed87c6 (patch) | |
| tree | ac05a9d9cd3c2f907970eb0272e897313f840f95 /sql/mysqld.cc | |
| parent | 8bf9ccb627af48fa24cce5699c9a9c2314cc406d (diff) | |
| parent | e505696ffc54eeb819c5a59abeb3866155641ed8 (diff) | |
| download | mariadb-git-43b42ceee1702fe42e12c1b59a8e97cac3ed87c6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d861b073b6e..805e6860f65 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3343,7 +3343,6 @@ pthread_handler_decl(handle_connections_shared_memory,arg) HANDLE event_connect_answer= 0; ulong smem_buffer_length= shared_memory_buffer_length + 4; ulong connect_number= 1; - my_bool error_allow; char tmp[63]; char *suffix_pos; char connect_number_char[22], *p; |