diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-23 08:22:11 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-23 08:22:11 +0100 |
| commit | 0729263a3b46b47727a658e7b48fd5f9903f6bfc (patch) | |
| tree | 2cbb1f8217519c76f00a3a9cf344b6704c3c0637 /sql/parse_file.cc | |
| parent | f1849bb45ef979624ca1796d17d1b96cc040340f (diff) | |
| parent | dfd6bda9bd90c7d2aa149a841b26ba342a193484 (diff) | |
| download | mariadb-git-0729263a3b46b47727a658e7b48fd5f9903f6bfc.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/parse_file.cc:
Auto merged
Diffstat (limited to 'sql/parse_file.cc')
| -rw-r--r-- | sql/parse_file.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index 2a602e9ba28..7faa4081d7d 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -759,7 +759,6 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, char *eol; LEX_STRING *str; List<LEX_STRING> *list; - ulonglong *num; DBUG_ENTER("File_parser::parse"); while (ptr < end && found < required) |