igor@rurik.mysql.com
f29ed57531
Merge
2003-10-30 10:45:28 -08:00
serg@serg.mylan
54f9d44b7f
merged
2003-10-30 19:26:57 +01:00
bell@sanja.is.com.ua
393838ad61
merge
2003-10-26 19:38:41 +02:00
serg@serg.mylan
8cdc27da15
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
bell@sanja.is.com.ua
f349adf8de
support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
...
(BUG#1484)
2003-10-24 17:28:32 +03:00
bell@sanja.is.com.ua
faea7e0144
Merge
2003-10-23 21:26:06 +03:00
serg@serg.mylan
b820d2a347
query expansion for fulltext search
2003-10-23 15:21:06 +02:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
gluh@gluh.mysql.r18.ru
4bed4abb62
Merge commit
2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800
Scrum task 835 - text-to-datetime conversion function
2003-10-20 13:24:18 +05:00
monty@mashka.mysql.fi
72f0236336
Merge
2003-10-16 08:11:01 +03:00
monty@mashka.mysql.fi
f2884bac40
Changing max_insert_delayed_threads now also changes the size of thread alarm buffer.
2003-10-16 07:44:18 +03:00
monty@mashka.mysql.fi
e87c9f5ff8
merge with 4.0
2003-10-16 03:08:40 +03:00
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
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
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
e71b53a8fe
merge with 4.0 to get fix for SET enum_system_variable=NULL
2003-10-14 16:34:09 +03:00
monty@mashka.mysql.fi
2d3840f550
Fixed bug in SET enum_system_variable=NULL
2003-10-14 16:30:42 +03:00
monty@mashka.mysql.fi
461d1627b3
merge with 4.0 for more memory allocation variables.
2003-10-13 15:50:30 +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
bell@laptop.sanja.is.com.ua
b5aeed824f
merge
2003-10-09 09:20:01 +03:00
bell@laptop.sanja.is.com.ua
f836a796c4
added worning about changing requested size of query cache (BUG#1502)
2003-10-09 00:13:15 +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
bell@laptop.sanja.is.com.ua
381b680868
fixed error handling in SET and DO operators (BUG#1484)
2003-10-08 11:19:09 +03:00
heikki@hundin.mysql.fi
6112853cda
Many files:
...
Multiple tablespaces for InnoDB
sql_table.cc:
Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
2003-10-07 17:28:59 +03:00
serg@serg.mylan
2667d7f8cc
fix_max_connections to resize alarm_queue (Bug #1435 )
2003-10-06 14:11:16 +02: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
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
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02: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
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
bar@bar.mysql.r18.ru
fb4f5e7d42
Bug fix:
...
SET character_set_connection=newcharset;
SELECT hex('text');
The above sequence failed in some cases.
2003-09-16 17:14:23 +05:00
bar@bar.mysql.r18.ru
1d20c09ce9
New SQL variables "collation_server" and "collation_database"
2003-09-15 16:31:04 +05:00
monty@mashka.mysql.fi
f300e3a164
Remove 'extern' references from .cc files
2003-09-13 11:35:29 +03:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03: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
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
igor@rurik.mysql.com
2090d57929
key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
...
After merge fix
2003-08-26 15:14:13 -07:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
igor@rurik.mysql.com
40193a7fa5
Manual merge
2003-08-26 00:13:22 -07:00
serg@serg.mylan
a72587ffb0
sorted
2003-08-21 10:44:17 +02:00
monty@mashka.mysql.fi
eb6458cb18
After merge fixes + bugs from last merge
2003-08-19 16:00:12 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +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
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00