database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Clean up merge from 4.1

Browse Source 
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
This commit is contained in:
unknown
2005-05-02 10:19:37 -07:00
parent d41aa2976e 9f5a4955d0
commit 41e7a9709d
13 changed files with 208 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@@ -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;