diff options
| author | unknown <jimw@mysql.com> | 2005-05-02 10:19:37 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-02 10:19:37 -0700 |
| commit | 41e7a9709db166842e11d00dd15eb8d1762d3285 (patch) | |
| tree | 64d81ff9452ecfafb3894ee63c2acd7ccf96ce64 /sql | |
| parent | d41aa2976ed430dce3fa9ebff84c8bdddbbb967a (diff) | |
| parent | 9f5a4955d0ccfd27f5338c04e17e5fabd3840616 (diff) | |
| download | mariadb-git-41e7a9709db166842e11d00dd15eb8d1762d3285.tar.gz | |
Clean up merge from 4.1
configure.in:
Auto merged
extra/my_print_defaults.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/lowercase_table.result:
Auto merged
mysql-test/r/query_cache.result:
Mege results
mysql-test/t/lowercase_table.test:
Merge tests
mysql-test/t/query_cache.test:
Merge tests
mysys/default.c:
Merge from 4.1
sql/sql_cache.cc:
Merge
sql/sql_parse.cc:
Merge from 4.1
sql/sql_table.cc:
Merge
tests/mysql_client_test.c:
Merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_cache.cc | 5 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 4a4f61f985c..430e0fbcabf 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1950,6 +1950,11 @@ my_bool Query_cache::write_result_data(Query_cache_block **result_block, type = Query_cache_block::RES_CONT; } while (block != *result_block); #else + /* + Set type of first block, emb_store_querycache_result() will handle + the others. + */ + (*result_block)->type= type; Querycache_stream qs(*result_block, headers_len); emb_store_querycache_result(&qs, (THD*)data); #endif /*!EMBEDDED_LIBRARY*/ diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 0cb3a1cbc11..22febd50035 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -506,7 +506,7 @@ static int check_for_max_user_connections(THD *thd, USER_CONN *uc) uc->user_resources.conn_per_hour <= uc->conn_per_hour) { net_printf_error(thd, ER_USER_LIMIT_REACHED, uc->user, - "max_connections", + "max_connections_per_hour", (long) uc->user_resources.conn_per_hour); error=1; goto end; diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 18c90d549ec..38944e3117d 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2550,6 +2550,8 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, reg_ext, NullS); /* Resolve symlinks (for windows) */ fn_format(src_path, src_path, "", "", MYF(MY_UNPACK_FILENAME)); + if (lower_case_table_names) + my_casedn_str(files_charset_info, src_path); if (access(src_path, F_OK)) { my_error(ER_BAD_TABLE_ERROR, MYF(0), src_table); |