monty@mashka.mysql.fi
0d34e50f39
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-10-15 22:52:31 +03:00
monty@mashka.mysql.fi
9ef2a83fbe
Portability fixes for windows
...
After merge fixes
2003-10-15 22:40:36 +03:00
gluh@gluh.mysql.r18.ru
9c2867c2d4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
2003-10-15 14:51:56 +05:00
gluh@gluh.mysql.r18.ru
9e401712a0
WL#1106: Switch = --maxdb rather than --sapdb
2003-10-15 14:50:36 +05:00
monty@mashka.mysql.fi
461d1627b3
merge with 4.0 for more memory allocation variables.
2003-10-13 15:50:30 +03: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
monty@narttu.mysql.fi
9e57c12b5a
Fixed bug in error handling of CREATE ... SELECT
...
More tests cases
After merge fixes
2003-10-08 18:53:31 +03:00
monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
bell@laptop.sanja.is.com.ua
5b13ec47dd
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 02:20:23 +03:00
monty@mishka.mysql.fi
53fa223ed6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-06 22:57:04 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42
Merge
2003-10-06 20:55:06 +03:00
bar@bar.mysql.r18.ru
67347790de
sql_cache.cc, mysql_priv.h:
...
Query cache now takes in account character_set_results and collation_connection
2003-10-03 17:09:54 +05:00
monty@mishka.mysql.fi
0d21572d01
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-03 02:08:49 +03: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
monty@mishka.mysql.fi
a5d9c195d3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.fi:/home/my/mysql-4.1
2003-09-29 22:06:49 +03:00
monty@mishka.mysql.fi
9210e8729a
Add missing define (after merge)
2003-09-29 22:06:31 +03:00
lenz@mysql.com
9b8b92faff
- enable changing the number of table bits for JOINs to be increased
...
from ulong to ulonglong by defining -DBIG_JOINS
2003-09-29 12:01:10 +02: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
hf@deer.(none)
192fcb9cc6
Bug fixed
...
null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error
i put the declaration of the null_string in mysql_priv.h and renamed it
to my_null_string to reduce the probability of name's intersections
2003-09-25 13:02:45 +05:00
monty@mishka.mysql.fi
c22c1d8a4d
merge
2003-09-24 10:24:56 +03:00
hf@deer.(none)
e89e3ff753
SCRUM
...
embedded library
some dirty places cleaned:
uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library
2003-09-18 18:58:02 +05:00
hf@deer.(none)
ddbca4176d
SCRUM:
...
prepared statements in embedded library
2003-09-17 20:48:53 +05: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
monty@mashka.mysql.fi
f300e3a164
Remove 'extern' references from .cc files
2003-09-13 11:35:29 +03:00
dlenev@mysql.com
1c11077d60
Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with
...
their newer DES_ versions.
Provided macros for backward compatibility.
2003-09-12 22:33:43 +04:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
bell@sanja.is.com.ua
813d81c726
removing additional IN subquery condition
...
fixed IN optimisation bug
2003-09-08 21:58:09 +03: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
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
monty@narttu.mysql.fi
a2a1e97226
Portability fixes
2003-08-28 22:18:02 +03:00
bell@laptop.sanja.is.com.ua
5553868638
fixed bug of lack of fix_fields call (after merge bugfix (SCRUM))
...
fixed bug in Item_sum
fixed bug in dependence remover
after merge fix
2003-08-23 13:29:38 +03:00
monty@narttu.mysql.fi
9d02d19ce8
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-08-23 12:26:08 +03:00
monty@narttu.mysql.fi
e12136b468
show symlinked directories in SHOW CREATE TABLE
2003-08-23 12:25:39 +03:00
Sinisa@sinisa.nasamreza.org
ced195f8a9
After merge fixes
2003-08-22 18:43:46 +03:00
serg@serg.mylan
08d7f298ee
fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
...
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
2003-08-21 16:15:06 +02:00
bell@laptop.sanja.is.com.ua
30913419ec
after merge changing
...
uninitialized value fixed
2003-08-20 17:35:12 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
monty@narttu.mysql.fi
d79cbc3b99
Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)
...
Changed some non fatal myisamchk error messages to warnings
2003-08-17 14:10:15 +03:00
bell@laptop.sanja.is.com.ua
85f397781b
Code cleanup
2003-08-16 13:26:48 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
bell@sanja.is.com.ua
de705e53f2
fixed bug in used_tables() report of left expression of IN subquery
...
fixed number of rows of external field reported to optimizer
added check of choosen key (checked left expression tag)
(SCRUM fix for simple IN optimisation)
2003-08-07 11:16:02 +03:00
kostja@oak.local
50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
