Commit graph

910 commits

Author SHA1 Message Date
serg@serg.mylan
1d617f1888 followup to max_user_connections fix, keep the count more accurate 2003-10-29 08:33:31 +01:00
bell@sanja.is.com.ua
ae380c5855 merge 2003-10-28 12:45:37 +02:00
serg@serg.mylan
75454930dc fixes for max_user_connections (connections are now counted even if
max_user_connections is not set - that is no limit - so that when
max_user_connections is set (with SET) old connections are also
taken into account
mutexes are added where appropriate
2003-10-27 15:14:03 +01:00
heikki@hundin.mysql.fi
24db4ecf97 sql_parse.cc:
Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections
2003-10-26 20:56:52 +02:00
serg@serg.mylan
eb93b6b81a return proper value (otherwise mysld crashes here) 2003-10-25 21:12:38 +02:00
heikki@hundin.mysql.fi
5584d422ee sql_parse.cc:
Add diagnostic printf to chack that number of connections for a user never drops below zero
2003-10-25 19:12:29 +03:00
bell@sanja.is.com.ua
f293edd19b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-10-25 16:35:14 +03:00
serg@serg.mylan
9fa202de5f and -> && 2003-10-25 12:00:53 +02:00
bell@sanja.is.com.ua
4da4fdbf7c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-10-25 10:18:37 +03:00
heikki@hundin.mysql.fi
7891550ebe sql_parse.cc:
URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&
2003-10-25 01:38:42 +03:00
serg@serg.mylan
dd860ba354 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
2003-10-24 23:53:53 +02:00
serg@serg.mylan
c752d2cad0 removed one more hack that - as usual - almost always worked
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
2003-10-24 23:27:21 +02:00
bell@sanja.is.com.ua
85bdf7b925 made 'TODO' 2003-10-24 20:09:57 +03:00
bell@sanja.is.com.ua
faea7e0144 Merge 2003-10-23 21:26:06 +03:00
bell@sanja.is.com.ua
934fa2a104 Merge 2003-10-22 20:52:47 +03:00
bell@sanja.is.com.ua
a7bdd19707 subqueries made printable
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
monty@mashka.mysql.fi
e87c9f5ff8 merge with 4.0 2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
35c09b8082 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-15 16:23:01 +03:00
serg@serg.mylan
f078e50a6b make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level. 2003-10-14 13:10:41 +02:00
heikki@hundin.mysql.fi
5ec87f2449 Many files:
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
2003-10-13 11:20:19 +03:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage:
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
bell@laptop.sanja.is.com.ua
200eb65df7 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-09 09:30:26 +03:00
monty@narttu.mysql.fi
d37a5c4dd7 Indentation cleanups
Remove wait_if_global_read_lock on commit as this can cause deadlocks
2003-10-08 21:50:05 +03:00
bell@laptop.sanja.is.com.ua
afac13d033 Some simple optimisation
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
2003-10-08 17:40:54 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
ram@gw.mysql.r18.ru
cb334d03f4 WL #562: Change format of slow log in 4.1 2003-10-07 12:05:35 +05:00
hf@deer.(none)
4ef1e3635d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-04 19:28:50 +05:00
hf@deer.(none)
8bc13b1874 Fix for bugs #1437, #1446 2003-10-04 19:28:08 +05:00
bell@laptop.sanja.is.com.ua
d360ddc0b2 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_struct-4.1
2003-10-02 12:18:34 +03:00
bell@laptop.sanja.is.com.ua
c3ab43b3f0 Structure for storing parameters of query in query cache (asked by Bar) 2003-10-02 12:02:05 +03:00
igor@rurik.mysql.com
f17ff0bc39 Many files:
Fix after manual merge
2003-10-01 23:37:05 -07:00
igor@rurik.mysql.com
17aecac32c Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:16:36 -07:00
vva@eagle.mysql.r18.ru
293f27df35 fixed processing of COM_BINLOG_DUMP to use in mysqlbinlog 2003-09-29 15:42:33 -04:00
hf@deer.(none)
9dcce9b0f3 fix for #1344
handling of init-file option added to embedded library
main problem was killing of output (resulting recordsets etc)
i added checks for empty output in Protocol:: methods
better solution could be special Protocol_nul class to redirect
results to nowhere
2003-09-29 21:07:53 +05:00
hf@deer.(none)
3f0096f9bb SCRUM
WL604 Privilegies in embedded library
another bug fixed
2003-09-29 12:50:28 +05:00
hf@deer.(none)
7f542f3e33 SCRUM
WL#604 Privileges in embedded library
bugs fixed
2003-09-29 11:47:37 +05:00
hf@deer.(none)
5f8e7fef27 Merge 2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2 SCRUM:
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
monty@mishka.mysql.fi
c22c1d8a4d merge 2003-09-24 10:24:56 +03:00
hf@deer.(none)
a2dbfaefa3 SCRUM
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05:00
bell@sanja.is.com.ua
fb48eaaa81 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-09-17 14:55:27 +03:00
bar@bar.mysql.r18.ru
4cb99ed5bb Bug fix:
http://bugs.mysql.com/bug.php?id=1129
From:	Georg Richter
Description: there is a problem with special chars like umlauts in comments
2003-09-16 12:14:40 +05:00
kostja@oak.local
f860f4d32c minor authentification optimisation 2003-09-16 02:39:25 +04:00
bell@sanja.is.com.ua
ea187cfd42 fixed proccesing global LIMIT in last SELECT of UNION 2003-09-14 22:12:55 +03:00
monty@mashka.mysql.fi
c674ffd5f1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-09-14 18:14:43 +03:00
Sinisa@sinisa.nasamreza.org
a26847c275 Fixes for OPTION_FOUND_ROWS in UNION's 2003-09-13 19:56:58 +03:00
monty@mashka.mysql.fi
f300e3a164 Remove 'extern' references from .cc files 2003-09-13 11:35:29 +03:00
guilhem@mysql.com
40a88045cb Quick backport of the following bugfix from MySQL 4.0.14.
DO NOT COPY THIS CODE TO 4.0. The bugfix is better in 4.0,
but here in 3.23 we don't want to add a new error code so
we just use ER_EMPTY_QUERY. Bug was:
"If a query was ignored on the slave (because of
@code{replicate-ignore-table} and other similar rules), the slave
still checked if the query got the same error code (0, no error) as on
the master. So if the master had an error on the query (for example,
``Duplicate entry'' in a multiple-row insert), then the slave stopped
and warned that the error codes didn't match. (Bug #797)"
2003-09-12 17:26:48 +02:00
guilhem@mysql.com
59663fc661 * Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly".
Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
2003-09-11 23:17:28 +02:00
monty@mashka.mysql.fi
7538242e4f merge with 4.1 tree 2003-09-11 20:31:40 +03:00