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
monty@mashka.mysql.fi
73f66f68fd
merge with 4.0.15
2003-09-11 20:24:14 +03:00
bar@bar.mysql.r18.ru
6fa45cec53
mysql_create_table now accepts field lengths in CREATE form, not in internal form.
...
This is to simplify fixing indexes to mean number of chars rather than bytes too.
2003-09-10 17:25:26 +05:00
monty@mashka.mysql.fi
99490870e6
Cleaned up last bug fixes
...
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
2003-09-09 20:06:50 +03:00
hf@deer.(none)
cf0c41aab4
fix for #1218
2003-09-08 17:00:39 +05:00
hf@deer.(none)
9807a3fa55
Trimming of embedded library code
2003-09-08 15:08:53 +05:00
hf@deer.(none)
05f53a0422
fix for #1211
2003-09-08 14:46:44 +05:00
monty@mashka.mysql.fi
80565e1352
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-tmp
2003-09-07 15:14:32 +03:00
hf@deer.(none)
c7297eba3e
Fix for LOAD DATA to work with embedded library
2003-09-06 18:50:30 +05:00
monty@mashka.mysql.fi
08e5b18fa2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-tmp
2003-09-04 02:49:35 +03:00
kostja@oak.local
fbbc9a00af
fixed bug - check_user shall not be included into the
...
embedded library.
2003-09-03 21:52:42 +04:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
serg@serg.mylan
7d2b0a0ce7
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-03 15:40:19 +02:00
kostja@oak.local
2335c7a0d4
fixed after-merge bug in CHANG_USER command
2003-09-03 17:29:51 +04:00
kostja@oak.local
36dd82c1d5
merge commit, hope that none of bar and dlenev changes were
...
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c
merged
2003-09-03 12:07:18 +02:00
serg@serg.mylan
2fcab1c2ee
CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]
2003-09-03 11:34:32 +02:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
kostja@oak.local
7a51e36929
removed stale comment
...
13:58 <monty> konstantin: the comment is missplaced (probably after merge).
You can remove it
2003-08-29 14:38:39 +04:00
monty@narttu.mysql.fi
27e331c30a
Revert change of lower-case-table handling as this breaks how alias works.
...
Changes like this should be done to 4.1, not to a stable release
2003-08-29 04:17:30 +03:00
igor@rurik.mysql.com
40193a7fa5
Manual merge
2003-08-26 00:13:22 -07:00