mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16885 commits 2784 branches 343 tags 1.6 GiB
Commit graph

16885 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingo@mysql.com
4bff1b05fd BUG#6034 - Error code 124: Wrong medium type 
Completely recoded the bugfix for 4.1.
This is just a merge changeset.
 2005-01-20 12:48:46 +01:00
ingo@mysql.com
fd0fdcdaa8 BUG#6034 - Error code 124: Wrong medium type. 
Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
 2005-01-19 21:16:27 +01:00
ingo@mysql.com
9a914a0022 BUG#6034 - Error code 124: Wrong medium type. 
Version for 4.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
 2005-01-19 21:13:30 +01:00
konstantin@mysql.com
0e56df7572 Cleanups in Makefile.ams 2005-01-18 17:26:04 +03:00
bar@mysql.com
8cfe729678 1. Item now uses my_charset_bin by default, 
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.
 2005-01-18 17:41:06 +04:00
konstantin@mysql.com
9fa2bb096c Fix 'make distclean' goal. 2005-01-18 16:23:10 +03:00
guilhem@mysql.com
b08170f18c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-18 14:07:47 +01:00
lenz@mysql.com
a074e676bf Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/space/my/mysql-4.0
 2005-01-18 12:10:11 +01:00
lenz@mysql.com
69bfcfe33a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-18 11:41:51 +01:00
guilhem@mysql.com
9569b0226f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-18 10:24:25 +01:00
bar@mysql.com
8f23e90232 #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals 
We should not overwrite res if it is returned from a const item.
 2005-01-18 10:42:29 +04:00
monty@mysql.com
edffca827e Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2005-01-18 03:52:15 +02:00
monty@mysql.com
e5b788146a Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
monty@mysql.com
5ba79d72a7 Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
bell@sanja.is.com.ua
fd3d976f64 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
 2005-01-18 01:11:02 +02:00
guilhem@mysql.com
5e43cf86a6 Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'": 
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)
 2005-01-17 21:26:14 +01:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql-4.1
 2005-01-17 14:08:36 -06:00
reggie@bob.(none)
e1dc421a04 Bug #7966 query cache doesn't work properly with batch statements 
sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query
 2005-01-17 13:40:36 -06:00
lenz@mysql.com
b9f3f4a221 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 20:33:33 +01:00
paul@kite-hub.kitebird.com
63689a210d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 12:38:17 -06:00
lenz@mysql.com
c84180d2c2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-01-17 19:09:33 +01:00
lenz@mysql.com
b1cb5ea4dc Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.1-build
 2005-01-17 18:53:10 +01:00
bell@sanja.is.com.ua
dcfdf011c6 backported from 5.0 patch initialization of main select for commands where subqueries are possible 2005-01-17 19:52:07 +02:00
paul@kite-hub.kitebird.com
43f98d24ee Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2005-01-17 10:47:43 -06:00
lenz@mysql.com
09a71351e0 - Enabled the handling of architecture extensions e.g. "-64bit" when building 
Mac OS X PKGs with Do-pkg
 2005-01-17 17:22:17 +01:00
kaa@polly.local
c46f527454 Fixed memory leak in handle_local_infile() 2005-01-17 19:21:01 +03:00
timour@mysql.com
50e0474394 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 15:46:44 +02:00
tomas@poseidon.ndb.mysql.com
9dbe52bdcf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-17 12:53:50 +01:00
tomas@poseidon.ndb.mysql.com
beffd06278 Bug#7937 2005-01-17 12:29:43 +01:00
timour@mysql.com
06fce173c0 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 12:41:59 +02:00
bar@mysql.com
e7e5e8b1e7 user_var.result, func_str.result, item_strfunc.cc: 
bug#7839 ncorrect collation for char(ascii('a'))
 2005-01-17 10:38:35 +04:00
paul@kite-hub.kitebird.com
3b9c5f3a17 mysqldump.c: 
Move out-of-order option.
 2005-01-17 00:09:47 -06:00
bar@mysql.com
308aec1526 libmysql.c: 
bug#7891: mysql_character_set_name() returns collation
 2005-01-17 09:27:24 +04:00
guilhem@mysql.com
6412558d03 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-16 21:39:20 +01:00
tomas@poseidon.ndb.mysql.com
b34715555f Makefile.am: 
Bug#7721
 2005-01-16 21:39:19 +01:00
serg@serg.mylan
fa38a0d130 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-16 16:41:38 +01:00
serg@serg.mylan
8bea4729fc initialize mysql->charset in mysql_init 2005-01-16 16:38:38 +01:00
guilhem@mysql.com
6cc7f39da0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-16 15:14:06 +01:00
reggie@bob.(none)
68c540f090 Bug #7922 prompt \p fails on Windows for shared-memory connections 
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
 2005-01-15 23:19:34 -06:00
serg@serg.mylan
ef58da5435 don't ignore errors in readlink 2005-01-15 20:08:53 +01:00
monty@mysql.com
f34bc883ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-15 12:00:56 +02:00
guilhem@mysql.com
09f36a69b9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-15 10:21:50 +01:00
igor@rurik.mysql.com
cd577f2590 func_gconcat.result, func_gconcat.test: 
Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
 2005-01-15 01:05:00 -08:00
monty@mysql.com
7681e62422 Merge 2005-01-15 03:49:07 +02:00
monty@mysql.com
6d280ac161 Fixed possible access to unintialized memory in filesort when using many buffers 2005-01-15 03:47:06 +02:00
serg@serg.mylan
275a9293e4 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
serg@serg.mylan
5ebcb21f12 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-14 19:51:29 +01:00
serg@serg.mylan
367bcf8c40 limit HEAP table size with max_heap_table_size, better estimation for mem_per_row 2005-01-14 19:49:45 +01:00
jimw@mysql.com
bc7f4b2cfe Merge mysql.com:/home/jimw/my/mysql-4.0-clean 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-14 10:45:17 -08:00
jimw@mysql.com
46e444293a Merge mysql.com:/home/jimw/my/mysql-4.0-7347 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-01-14 10:44:29 -08:00