diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2009-03-25 23:41:16 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2009-03-25 23:41:16 +0400 |
| commit | aca1a83fedd916492c97f77557d27c79ae54da43 (patch) | |
| tree | 7aa34f58ecccff62834f2f5bd96104233a64261f /sql/sql_class.cc | |
| parent | 4f5f7f353ac4783fae7aa0bff891d1325177cc82 (diff) | |
| parent | eccad3f252e0263249eee45d3d76987d4fc0d4e2 (diff) | |
| download | mariadb-git-aca1a83fedd916492c97f77557d27c79ae54da43.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 4f92d3aea10..7f15508caa1 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -599,6 +599,7 @@ THD::THD() one_shot_set= 0; file_id = 0; query_id= 0; + query_name_consts= 0; warn_id= 0; db_charset= global_system_variables.collation_database; bzero(ha_data, sizeof(ha_data)); |