diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
| commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
| tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /sql/sql_class.cc | |
| parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz | |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 6f068074641..45478ab66e8 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3590,7 +3590,6 @@ show_query_type(THD::enum_binlog_query_type qtype) default: DBUG_ASSERT(0 <= qtype && qtype < THD::QUERY_TYPE_COUNT); } - static char buf[64]; sprintf(buf, "UNKNOWN#%d", qtype); return buf; |