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

9523 commits

Author SHA1 Message Date
dlenev@brandersnatch.localdomain
348218d21d Fix for bug #7637: "Test failure: 'user_limits' on QNX and 64-bit systems" 
Made user_limits.test scheduling independant (this solves failure on QNX).

Made sys_var_max_user_conn variable int sized. Changed 
max_user_connections from ulong to uint to be able to use it in 
sys_var_max_user_conn::value_ptr() (solves failures on 64-bit platforms).
 2005-01-20 00:54:01 +03:00
jimw@mysql.com
3bdfe44859 Warn when mysqld starts up with lower_case_table_names=2 but datadir is 
on a case-sensitive filesystem. (Bug #7887)
 2005-01-19 12:23:24 -08:00
ingo@mysql.com
ea8882be80 BUG#6034 - Error code 124: Wrong medium type. 
Version for 5.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.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.
 2005-01-19 21:20:55 +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
sergefp@mysql.com
9a7a47c21c Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885 
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
 2005-01-19 23:11:50 +03:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
 2005-01-19 23:02:28 +03:00
bell@sanja.is.com.ua
e05b028c80 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-19 20:53:29 +02:00
tulin@build.mysql.com
16f77ce996 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 14:20:28 +01:00
gluh@gluh.mysql.r18.ru
c1b92f6a90 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-19 16:20:25 +03:00
gluh@gluh.mysql.r18.ru
994c1fd4d8 View field names should be case insensitive 2005-01-19 16:19:10 +03:00
ram@gw.mysql.r18.ru
92545cb3a9 ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED. 2005-01-19 16:24:06 +04:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285. 
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
 2005-01-19 12:55:54 +02:00
ram@gw.mysql.r18.ru
f131e5a925 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-19 12:05:59 +04:00
ram@gw.mysql.r18.ru
c24c023e8c A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation). 2005-01-19 12:04:35 +04:00
joreland@mysql.com
2af06e0b32 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-19 07:37:42 +01:00
joreland@mysql.com
18bd4a2513 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-19 07:34:57 +01:00
joreland@mysql.com
b0b8f9115a bug#7693 - ndb 
when using shm transporter, set sigmask on each thread using pthread_sigmask
 2005-01-19 07:23:20 +01:00
tomas@poseidon.ndb.mysql.com
f8a0287fac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-19 04:44:45 +01:00
tomas@poseidon.ndb.mysql.com
05bc990045 changed "formatting" after sergs comments on prev chanset 2005-01-19 04:43:54 +01:00
jimw@mysql.com
aa414896f0 Fix query cache to not respond to old clients with a 4.1-protocol 
response. (Bug #6511)
 2005-01-18 15:59:39 -08:00
jimw@mysql.com
1edf7279ef Merge from 4.1. 2005-01-18 13:59:55 -08:00
jimw@mysql.com
06f60f6d65 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03 after merge fixes 2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
08639a88b2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-01-18 23:29:47 +02:00
tomas@poseidon.ndb.mysql.com
a7c56a858b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 22:25:19 +01:00
Sinisa@sinisa.nasamreza.org
477047401c fixing wrong value for "examined rows" when UNION's are used. 2005-01-18 23:13:29 +02:00
tomas@poseidon.ndb.mysql.com
aabe11028a removed default usage of shared memory transporter as it is not verified on enough platforms 2005-01-18 22:09:15 +01:00
sergefp@mysql.com
48d7fe1671 Fix for valgrind failures in get_mm_tree. 2005-01-18 23:50:42 +03:00
jimw@mysql.com
59ffad87cc Merge mysql.com:/home/jimw/my/mysql-4.1-6913 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 12:27:00 -08:00
jimw@mysql.com
2fac8bd044 Merge changed tests 2005-01-18 12:25:56 -08:00
jimw@mysql.com
bc35532bcc Merge mysql.com:/home/jimw/my/mysql-4.0-7700 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-01-18 11:39:10 -08:00
dlenev@mysql.com
af878017b2 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-18 21:27:09 +03:00
bar@mysql.com
05204a9b3c After-merge clean-up 2005-01-18 22:12:33 +04:00
bar@mysql.com
f93bfe06b3 merge 2005-01-18 21:38:40 +04:00
sergefp@mysql.com
a55f4a5da4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 19:49:00 +03:00
tomas@poseidon.ndb.mysql.com
1b8e1674b4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 17:48:59 +01:00
gluh@gluh.mysql.r18.ru
0e5acfbb7b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-18 19:48:58 +03:00
gluh@gluh.mysql.r18.ru
16a2f9d204 bug #7981: SHOW GLOBAL STATUS crashes server(fix after review) 2005-01-18 19:47:39 +03:00
tomas@poseidon.ndb.mysql.com
61f63776db compile error: moved inline 
compile warning: changed eq_range -> eq_r
 2005-01-18 16:31:05 +01:00
gluh@gluh.mysql.r18.ru
c965dc34cd Fix for bug #7981: SHOW GLOBAL STATUS crashes server 2005-01-18 17:37:45 +03:00
sergefp@mysql.com
b1d55200b1 Fix for BUG#7885 2005-01-18 17:26:05 +03:00
dlenev@mysql.com
3d4eb575a2 Manual merge of fix for bug #7884 "Able to add invalid unique index on 
TIMESTAMP prefix" into 4.1 tree.
 2005-01-18 17:23:46 +03:00
dlenev@mysql.com
9e8d33ca35 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
 2005-01-18 17:05:09 +03:00
dlenev@mysql.com
b894c47d1d Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum() 
macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".
 2005-01-18 17:04:16 +03:00
sergefp@mysql.com
5d9b87ea9a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:48:50 +03:00
sergefp@mysql.com
d89166cd34 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:46:26 +03:00
guilhem@mysql.com
78b7ec0258 slave.cc: 
5.0 has a different way of knowing if master is < 3.23.57
 2005-01-18 14:46:26 +01: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
sergefp@mysql.com
1eab462cca Post-review fixes for the previous cset. No code behavior changes. 2005-01-18 16:16:55 +03:00
serg@serg.mylan
b53757ba91 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-18 11:45:41 +01:00
guilhem@mysql.com
5fbdd9bdcd Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-18 11:06:37 +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
b2dbddc39d Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 10:45:09 +04: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
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02: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
jimw@mysql.com
a35c324358 Fix over-optimization that could result in an unsigned double field being 
set to a negative value. (Bug #7700)
 2005-01-17 16:13:56 -08: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
0594d6af8b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-18 01:15:02 +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
serg@serg.mylan
83ef8c58a7 make the code to look safe, not only be safe 2005-01-17 22:35:53 +01: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
jimw@mysql.com
dbe43d34a6 Print a warning when an old table (with no character set stored) is opened 
and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913)
 2005-01-17 12:22:23 -08: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
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
joerg@mysql.com
88b1fbaf2f Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). 2005-01-17 18:08:07 +01:00
timour@mysql.com
bb77b2e55f Fix for BUG#7331 merged manually from 4.1. 2005-01-17 17:19:33 +02:00
bell@sanja.is.com.ua
bd15d10a07 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-17 13:23:39 +02: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
3d4714424c Merge 2005-01-17 12:30:12 +04:00
jan@hundin.mysql.fi
c894ebd66c Required changes to support recovery of X/Open XA in InnoDB. 2005-01-17 09:09: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
sergefp@mysql.com
6303ca7efa Fixes in opt_range.cc: ROR plan choice code 
* Removed unused parameters 
 * Fixed several cost calculation errors in ror_intersect_add
 * Better code structure for ror_intersect_add and get_best_ror_intersect
 2005-01-17 00:18:19 +03:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
bell@sanja.is.com.ua
ff3b643959 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-16 18:36:50 +02:00
bell@sanja.is.com.ua
2ca7c0062f postreview changes 2005-01-16 18:36:13 +02:00
serg@serg.mylan
2c0d5bb41d documented handlerton structure 2005-01-16 16:11:16 +01:00
guilhem@mysql.com
1cb5d98d85 When we warn that --log-bin alone is dangerous, we give a suggestion. 2005-01-16 15:46:28 +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
guilhem@mysql.com
c30e600081 Merge 2005-01-16 15:10:42 +01:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
jimw@mysql.com
65b800736f Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-15 10:14:34 -08:00
dlenev@brandersnatch.localdomain
31d3aabb49 Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly" 
to 5.0 tree (since it was lost during last merge).
 2005-01-15 20:02:46 +03:00
monty@mysql.com
8d616390e9 After merge fixes 
Fix for BIT(X) field as string
 2005-01-15 17:38:43 +02:00
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +02: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
de1ff0698b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-15 10:22:05 +01: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
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
a66f6b79be Merge mysql.com:/home/jimw/my/mysql-5.0-6659 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-14 10:47:21 -08:00
ram@gw.mysql.r18.ru
4b3996d587 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-14 18:32:43 +04:00
ram@gw.mysql.r18.ru
e6510c896b A fix for bit type. 
pack_length_in_rec() func has been introduced.
 2005-01-14 18:24:32 +04:00
guilhem@mysql.com
2c6738cd7d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-14 15:06:53 +01:00
guilhem@mysql.com
8ee8543aa9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 15:02:05 +01:00
msvensson@neptunus.homeip.net
cb7524e103 Merge problem 
FC3 fix
 2005-01-14 14:33:26 +01:00
tomas@poseidon.ndb.mysql.com
843ef4fcc8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-14 14:30:30 +01:00
marko@hundin.mysql.fi
080869f995 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/k/mysql-4.1
 2005-01-14 15:23:34 +02:00
guilhem@mysql.com
5cafbb6838 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 14:23:34 +01:00
tomas@poseidon.ndb.mysql.com
fa57a72b9b added support for 'show status like 'Ndb%'' 
added number_of_replicas printout in show table status
 2005-01-14 12:32:33 +01:00
marko@hundin.mysql.fi
7ef8a20950 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/j/mysql-5.0
 2005-01-14 13:06:46 +02:00
guilhem@mysql.com
4c41a0d5e4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-14 11:32:17 +01:00
guilhem@mysql.com
980d1b658e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 10:59:37 +01:00
dlenev@mysql.com
8be6787640 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-14 10:09:01 +03:00
patg@patrick-galbraiths-computer.local
7c51cce029 progress in fixing multi-key, two-byte prefix keys. 2005-01-13 18:21:54 -08:00
jimw@mysql.com
3998da80e9 Output 'MEMORY' as table type for tables using the memory (nee heap) storage 
engine, except when running with sql_mode & MYSQL323. (Bug #6659)
 2005-01-13 17:38:13 -08:00
anjuta@arthur.local
a8e6b5e68c Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2005-01-14 01:17:01 +02:00
monty@mysql.com
2204baa5a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-14 00:10:03 +02:00
monty@mysql.com
249f914c21 Fix bug in INSERT DELAYED with prepared statements 
The bug was that if you have two TL_WRITE_DELAYED at the same time,
mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.
 2005-01-14 00:09:15 +02:00
patg@patrick-galbraiths-computer.local
5dd710a958 change to have_<> variable for federated engine 2005-01-13 13:03:05 -08:00
jimw@mysql.com
fdc16dc434 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 12:40:34 -08:00
guilhem@mysql.com
d6c99656b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-13 21:36:28 +01:00
heikki@hundin.mysql.fi
94cc8442b0 ha_innodb.cc: 
"Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the execution is not serializable, and in many cases is not well-defined; we also merged the associated bug fix from 4.1"
 2005-01-13 21:58:47 +02:00
anjuta@arthur.local
8f169155d1 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2005-01-13 21:56:18 +02:00
jimw@mysql.com
9b798253eb Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 11:50:10 -08:00
jimw@mysql.com
dcd75689d3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 11:47:49 -08:00
heikki@hundin.mysql.fi
bdf26a4f9d Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-13 21:42:37 +02:00
monty@mysql.com
7c457a1bd7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-13 20:09:41 +02:00
heikki@hundin.mysql.fi
21666e4207 ha_innodb.cc: 
Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
 2005-01-13 20:08:28 +02:00
jani@ua141d10.elisa.omakaista.fi
83a57807e8 Applied a patch for Netware. 2005-01-13 19:46:46 +02:00
jimw@mysql.com
80c56602d3 Merge 2005-01-13 09:31:54 -08:00
tomas@poseidon.ndb.mysql.com
9f606fcfd8 To get correct values in SHOW TABLE STATUS 
Added pseudo column fragment memory
    changed ndb_get_table_statistics to take struct 
    and read row_size and fragment_memory
 2005-01-13 18:24:19 +01:00
jimw@mysql.com
7e1f47022c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:24:07 -08:00
heikki@hundin.mysql.fi
76789a4c13 ha_innodb.cc: 
Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
 2005-01-13 19:20:49 +02:00
anjuta@arthur.local
224fcd4717 Merge 2005-01-13 19:14:10 +02:00
jimw@mysql.com
ce1cd9f0ee Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 09:09:46 -08:00
jimw@mysql.com
28ee2a67b3 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 09:09:10 -08:00
jimw@mysql.com
73a9b29c3c Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:07:48 -08:00
jimw@mysql.com
7639e5afaf Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:07:21 -08:00
konstantin@mysql.com
9e10645cff Fix valgrind warning + post-merge fixes. 2005-01-13 19:03:21 +03:00
guilhem@mysql.com
c7c5cc80ad Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-13 15:59:48 +01:00
guilhem@mysql.com
a02601ecc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-13 15:35:36 +01:00
konstantin@mysql.com
a676498977 manual merge 2005-01-13 17:31:49 +03:00
marko@hundin.mysql.fi
c5708e1d65 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2005-01-13 16:16:05 +02:00
bar@mysql.com
e3d6e6736b bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
dlenev@mysql.com
52baee6346 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-13 14:46:41 +03:00
paul@kite-hub.kitebird.com
969b8ca5c4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 20:39:04 -06:00
paul@kite-hub.kitebird.com
231632e34f user_limits.result: 
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.
 2005-01-12 20:38:05 -06:00
jimw@mysql.com
3d2481ba4a Fix small memory leak that occured when BerkeleyDB failed to initialize. 2005-01-12 17:20:43 -08:00
monty@mysql.com
b8dc0c5d93 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-13 03:03:41 +02:00
monty@mysql.com
de4ec3ed30 Fix accesses to uninitialized memory (found by valgrind) 2005-01-13 03:02:49 +02:00
jimw@mysql.com
0a3fba7f18 Small fix for Field_str::store() to avoid trying to read past beginning 
of log_10 array.
 2005-01-13 00:52:19 +01:00
jimw@mysql.com
51781b0bfc Fix conversion of floating point values to character fields when the 
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)
 2005-01-13 00:41:45 +01:00
konstantin@mysql.com
019ff4c577 Manual merge. 2005-01-13 02:19:35 +03:00
konstantin@mysql.com
30c4d10e1a Add logging of COM_EXECUTE in the general query log. 2005-01-13 02:13:19 +03:00
guilhem@mysql.com
7d81a1d399 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 22:25:12 +01:00
guilhem@mysql.com
4c105693d7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-12 22:23:00 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3e3e140e3d Minor clean up. 2005-01-12 22:55:10 +02:00
paul@kite-hub.kitebird.com
72ce1f5055 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 14:53:11 -06:00
sergefp@mysql.com
106509992e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
 2005-01-12 23:22:12 +03:00
paul@kite-hub.kitebird.com
e608d27f5a Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 14:17:56 -06:00
vtkachenko@mail.mysql.com
306df48731 Merge 2005-01-12 21:03:06 +01:00
vtkachenko@mail.mysql.com
9f640bbad9 logging_ok: 
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
 2005-01-12 20:55:06 +01:00
konstantin@mysql.com
f01f721672 manual merge 2005-01-12 21:51:04 +03:00
guilhem@mysql.com
20e494424a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 19:44:35 +01:00
guilhem@mysql.com
4e4f574645 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-12 19:44:19 +01:00
paul@kite-hub.kitebird.com
e7810fa9b9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 12:42:53 -06:00
guilhem@mysql.com
44ce4b43ef Fix for BUG#7793 "mysqlbinlog produces incorrect queries": 
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
 2005-01-12 19:42:46 +01:00
jimw@mysql.com
77fae11832 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 19:19:55 +01:00
guilhem@mysql.com
db56a953f6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 18:32:49 +01:00
jimw@mysql.com
0b041fe2e1 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 18:09:44 +01:00
paul@kite-hub.kitebird.com
48802d5b32 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 10:27:09 -06:00
heikki@hundin.mysql.fi
f55cb90f93 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-12 18:26:56 +02:00
heikki@hundin.mysql.fi
bdc9823cb6 ha_innodb.cc: 
Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
sync0sync.h:
  Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
row0ins.c:
  Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation
 2005-01-12 18:25:39 +02:00
guilhem@mysql.com
443d6c45e3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 17:06:53 +01:00
jimw@mysql.com
fd7d355fbd Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 17:05:33 +01:00
paul@kite-hub.kitebird.com
86ed717a3f Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 10:05:33 -06:00
konstantin@mysql.com
2cc2844bbb Merge mysql.com:/home/kostja/work/mysql-4.0-6761 
into mysql.com:/home/kostja/work/mysql-4.1-root
 2005-01-12 19:00:04 +03:00
konstantin@mysql.com
6058edbe18 A fix for Bug#6761 "mysql_list_fields() does not work": test 
case will be added to client_test in 4.1
 2005-01-12 17:04:45 +03:00
monty@mysql.com
073a8881ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-12 16:02:46 +02:00
marko@hundin.mysql.fi
69afdf53c7 InnoDB: Use system-supplied tmpfile() on Netware, as there is no 
open interface for setting the "delete-on-close" flag.
 2005-01-12 15:24:49 +02:00
bell@sanja.is.com.ua
927071b4ad Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-12 14:23:23 +02:00
marko@hundin.mysql.fi
6289469e97 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/k/mysql-4.1
 2005-01-12 14:08:25 +02:00
serg@serg.mylan
e83f49bd2f Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-01-12 12:35:34 +01:00
serg@serg.mylan
b86a512e37 added missing Com_update_multi status variable 2005-01-12 12:18:17 +01:00
shuichi@mysql.com
852d74a68e renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
monty@mysql.com
11c63eae01 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-12 11:45:04 +02:00
dlenev@brandersnatch.localdomain
23c9e0a75a Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly". 2005-01-12 12:18:36 +03:00
sergefp@mysql.com
fda91bee40 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
 2005-01-12 09:05:11 +03:00
sergefp@mysql.com
4860bf9a06 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-look-valgrind
 2005-01-12 09:05:10 +03:00
sergefp@mysql.com
ea8d861d23 Fix for use of unitialized variable errors: Manually delete 
{min,max}_functions_it as it is not allocated on the pool.
 2005-01-12 08:15:46 +03:00
shuichi@mysql.com
3126e82291 added new character set - cp932, eucjp_ms 2005-01-11 17:45:36 -08:00
monty@mysql.com
aad3d64a6f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-12 03:40:02 +02:00
monty@mysql.com
314cf993c6 Fixed memory reference errors found by valgrind 2005-01-12 03:38:53 +02:00
paul@kite-hub.kitebird.com
1e76b778b2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-11 13:28:58 -06:00
hf@deer.(none)
6f511796fc Merging fixed 2005-01-11 23:28:56 +04:00
hf@deer.(none)
38baa28a10 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-01-11 22:15:29 +04:00
jani@ua141d10.elisa.omakaista.fi
fd79354273 Fixed Bug#2813, "analyse does not quot string values in enams from string". 2005-01-11 19:40:33 +02:00
monty@mysql.com
f4274fe9be Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-11 19:35:00 +02:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
joreland@mysql.com
c9502b5567 merge 2005-01-11 17:02:30 +01:00
joreland@mysql.com
7f287d963c removed compiler warnings from ha_ndbcluster 2005-01-11 17:00:31 +01:00
bar@mysql.com
2bd854c859 Bug #7730 Server crash using soundex on an utf8 table 
Don't use my_tolower: it works only for 8bit charsets.
 2005-01-11 19:58:53 +04:00
paul@kite-hub.kitebird.com
dc5c99e26b Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-11 09:41:35 -06:00
lenz@mysql.com
33795908a0 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-01-11 16:02:45 +01:00
lenz@mysql.com
0d08e9b2c2 - Housekeeping: removed a few unreferenced variables, noticed while doing 
Windows builds
 2005-01-11 15:38:03 +01:00
marko@hundin.mysql.fi
1fdff1f344 InnoDB: Implement fast TRUNCATE TABLE (Bug #7150) 2005-01-11 16:28:07 +02:00
serg@serg.mylan
9a43b64874 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-11 14:29:22 +01:00
mskold@mysql.com
082bd01572 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-11 14:21:58 +01:00
mskold@mysql.com
e72f9108ef Removed compiler warnings 2005-01-11 14:06:44 +01:00
bar@mysql.com
691b3283d2 If VARCHAR strips only trailing spaces, then produce 
a note, not a warning or error.
 2005-01-11 16:49:45 +04:00
konstantin@mysql.com
a55cd1f1c4 Fixes for two compile-time failures. 2005-01-11 15:32:23 +03:00
konstantin@mysql.com
a0bc131743 Merge mysql.com:/home/kostja/work/mysql-4.1-7428 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-01-11 14:47:12 +03:00
dlenev@brandersnatch.localdomain
2f32115092 Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDB 
mode".

Changed grammar rule for "type" token. Now we have one branch with 
optional length specification for TIMESTAMP type instead of two separate
branches.
 2005-01-11 14:26:40 +03:00
konstantin@mysql.com
067d13f632 A fix for linking failure of MySQL client when linking with imap libraries 
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
 2005-01-11 13:53:10 +03:00
konstantin@mysql.com
876a96cd02 make it compile with -ansi -pedantic 2005-01-11 13:12:52 +03:00
bell@sanja.is.com.ua
dd56d63f48 error of parsing can occur in any SELECT, so all SELECTs have to be checked 2005-01-11 11:53:39 +02:00
serg@serg.mylan
b670f88287 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-11 10:34:38 +01:00
mskold@mysql.com
20184b7047 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-11 10:31:31 +01:00
jimw@mysql.com
64c04a4c26 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-11 05:11:42 +01:00
jimw@mysql.com
3d0e2e70c6 Merge 2005-01-11 05:10:08 +01:00
serg@serg.mylan
e9ac8dbc51 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-11 02:36:50 +01:00
jimw@mysql.com
e173b24f75 Merge mysql.com:/home/jwinstead2/mysql-4.1-7762 
into mysql.com:/home/jwinstead2/mysql-4.1-clean
 2005-01-11 01:25:46 +01:00
jimw@mysql.com
699cb2c066 Fix style nit 2005-01-11 01:01:35 +01:00
kent@mysql.com
feee6ee30b field.h, field.cc: 
Did some more split TABLE to TABLE and TABLE_SHARE
 2005-01-11 00:17:21 +01:00
guilhem@mysql.com
61a65d42f0 Encourage user to specify a name for the binlog index file (either by giving an argument to --log-bin, 
or by using --log-bin-index). This is so that he does not have a replication break when his master's
hostname changes. Plus binary logging options consistency checks.
 2005-01-11 00:16:07 +01:00
jimw@mysql.com
2347e386d7 Fix double-initalization of mutex in archive storage engine. (Bug #7762) 2005-01-10 23:59:28 +01:00
mskold@mysql.com
fb5e3b7245 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-10 23:27:37 +01:00
paul@kite-hub.kitebird.com
e496acdf63 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-10 14:12:49 -06:00
mskold@mysql.com
760b2a5f3b Fix for failing INSERT IGNORE 2005-01-10 20:55:05 +01:00
guilhem@mysql.com
09b45d80d5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-10 18:46:31 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b67a1f697a Initialize lex->mqh structure. Fixes valgrind warnings. 2005-01-10 16:24:05 +00:00
paul@kite-hub.kitebird.com
8e9403534b Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-10 09:18:31 -06:00
serg@serg.mylan
618d01e788 bad merge fixed 2005-01-10 16:03:06 +01:00
guilhem@mysql.com
b5a44aebbd Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-10 15:15:49 +01:00
monty@mysql.com
56fb6f31ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-10 15:28:17 +02:00
guilhem@mysql.com
da1d751b31 Merge mysql.com:/home/mysql_src/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-10 14:13:41 +01:00
guilhem@mysql.com
3439ce4ee3 Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]": 
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.
 2005-01-10 13:52:32 +01:00
joreland@mysql.com
10f41d7cc4 merge 2005-01-10 11:49:58 +01:00
joreland@mysql.com
4ddd79fb69 bug#7761 - ndb does not autcommit - postreview fixes 2005-01-10 11:33:08 +01:00
joreland@mysql.com
6331241cb3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-10 11:20:01 +01:00
joreland@mysql.com
c9f7f0ffcf bug#7761 - ndb does not autocommit during alter table 2005-01-10 11:17:01 +01:00
joreland@mysql.com
b4c251134f Merge mysql.com:/home/jonas/src/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-09 11:01:47 +01:00
paul@kite-hub.kitebird.com
57c9d22788 mysqld.cc: 
Fix out-of-order option.
 2005-01-08 22:34:54 -06:00
paul@kite-hub.kitebird.com
61041e55fe Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
 2005-01-08 19:46:52 -06:00
paul@kite-hub.kitebird.com
7585b5cb61 set_var.cc: 
Whack duplicate variable line. (Affects SHOW VARIABLES.)
 2005-01-08 19:43:15 -06:00
paul@kite-hub.kitebird.com
8f12ea836e sql_select.cc: 
silence picky compiler warning.
 2005-01-08 19:40:58 -06:00
paul@kite-hub.kitebird.com
840dd7c764 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
 2005-01-08 18:42:48 -06:00
paul@kite-hub.kitebird.com
cbd56fce87 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-08 18:32:57 -06:00
pekka@mysql.com
51adbae299 Merge 2005-01-09 00:45:06 +01:00
jimw@mysql.com
442fae37c5 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-08 23:32:53 +01:00
pekka@mysql.com
195f7bda02 Merge 2005-01-08 22:34:16 +01:00
jimw@mysql.com
e959e0b8fc Merge mysql.com:/home/jwinstead2/mysql-4.1-7233 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-08 22:22:41 +01:00
pekka@mysql.com
50c3a883b2 ndb - wl-1442 fix Time ordering 2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c ndb - wl-1442 fix Date ordering 2005-01-08 16:57:51 +01:00
vtkachenko@intelp4d.mysql.com
faeac11865 Merge bk-internal:/home/bk/mysql-5.0 
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
 2005-01-08 15:06:20 +01:00
vtkachenko@intelp4d.mysql.com
ad7dad8d03 Many files: 
- Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
 2005-01-08 15:01:37 +01:00
jimw@mysql.com
5c497ef3a8 Use 'USING <indextype>' in results of SHOW CREATE TABLE, it's the preferred 
syntax. (Bug #7233)
 2005-01-08 07:31:13 +01:00
jimw@mysql.com
f28a18c2d5 Show the index type even for indexes using the default index type in 
tables that support multiple index types. (Bug #7235)
 2005-01-08 06:15:41 +01:00
tulin@build.mysql.com
3d773f79ea Merge bk-internal:/home/bk/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-08 00:34:08 +01:00
pekka@mysql.com
7043c9d4aa ndb - wl-1442 minor 2005-01-08 00:03:19 +01:00
paul@kite-hub.kitebird.com
7e807dc727 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
 2005-01-07 14:18:38 -06:00
paul@kite-hub.kitebird.com
76b823cebe set_var.cc: 
Reorder variables to properly alphabetize SHOW VARIABLES output.
 2005-01-07 14:17:08 -06:00
paul@kite-hub.kitebird.com
8abb85a101 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
 2005-01-07 12:26:55 -06:00
jimw@mysql.com
6db6171494 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-07 19:03:35 +01:00
jimw@mysql.com
c2eb3bf9f6 Correctly truncate integers inserted into field and double columns 
with a number of decimals specified. (Bug #7361)
 2005-01-07 17:44:18 +01:00
marko@hundin.mysql.fi
52ebc04fc5 Introduce ROW_TYPE=REDUNDANT and ROW_TYPE=COMPACT for InnoDB table formats 2005-01-07 16:43:27 +02:00
tulin@build.mysql.com
d52bac6a78 Merge bk-internal:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
 2005-01-07 15:34:14 +01:00
serg@sergbook.mysql.com
a609bc45f2 merge 2005-01-07 15:02:25 +02:00
serg@sergbook.mysql.com
ea737638e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-01-07 14:27:07 +02:00
serg@sergbook.mysql.com
98bfc75d6a don't cast lvalue 2005-01-07 14:25:48 +02:00
pekka@mysql.com
f3103c489c ndb - wl-1442 new varchar 2005-01-07 11:55:20 +01:00
joreland@mysql.com
013f9bbfb5 merge 2005-01-07 07:15:08 +01:00
joreland@mysql.com
f3baf38dbc merge 2005-01-07 06:47:41 +01:00
brian@zim.(none)
3be57f961b This just fixes the compile issues for table structure changes. 
The test case does not currently work (I am comitting this so that Patrick will have a working copy).
I am going to look at the test case next. It is suspected that it is failing do to a change in mysql_test_run.
 2005-01-06 19:37:16 -08:00
brian@zim.(none)
2ee9d854b4 Updates for Monty's changes in the table structure. All tests pass currently. 
Seems like such a short commit message...
 2005-01-06 18:34:17 -08:00
brian@zim.(none)
75f282df27 Fix for compiling error in sql_parse 2005-01-06 16:31:18 -08:00
guilhem@mysql.com
60f5a69160 2 small fixes for binlog (sorry for grouping them - I won't do it again): 
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).
 2005-01-06 23:53:58 +01:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
serg@sergbook.mysql.com
15133e70ac Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-01-06 17:53:32 +02:00
bell@sanja.is.com.ua
421738e8ce removed unused label 2005-01-06 17:08:38 +02:00
monty@mysql.com
ef74d8d898 Fixed a bug in prepared statements error handling 
After merge fixes
 2005-01-06 16:59:29 +02:00
monty@mysql.com
bda0a78184 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-06 13:31:31 +02:00
monty@mysql.com
d35140a851 First stage of table definition cache 
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
 2005-01-06 13:00:13 +02:00
timour@mysql.com
a8f8433c9d Fix for BUG#7331. 
The problem was that when a QUICK_SELECT access method is chosen,
test_if_skip_sort_order() discovered that the index being used
by the quick select will not deliver tuples in sorted order.
In this case test_if_skip_sort_order() tried to change the index
used by the quick select, but it didn't properly set the other
members of the quick select, and especially the range flags of
the ranges in QUICK_SELECT::ranges.

The fix re-invokes the function SQL_SELECT::test_quick_select
to correctly create a valid QUICK_SELECT object.
 2005-01-06 10:49:26 +02:00
joreland@mysql.com
738cb6ab81 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-05 21:22:39 +01:00
joreland@mysql.com
c39db2febf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-05 21:22:38 +01:00
tomas@poseidon.ndb.mysql.com
79fb236b0a changed to using NdbTransaction scoped enums 
and removed usage of Ndb::waitUntilReady()
 2005-01-05 17:59:24 +01:00
jimw@mysql.com
fb0d89a85b Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-05 17:57:55 +01:00
bell@sanja.is.com.ua
e3045e85f3 added correct res initialisation 
and check of handler compatibility
 2005-01-05 17:42:22 +02:00
tulin@build.mysql.com
cee870e9b5 Merge bk-internal:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
 2005-01-05 15:55:26 +01:00
bell@sanja.is.com.ua
dffac28b76 fixed views with PS protocol 2005-01-05 16:48:23 +02:00
vtkachenko@intelp4d.mysql.com
bd47d6f360 set_var.cc, mysqld.cc, ha_innodb.h, innodb.test, innodb.result: 
Create new innodb_sync_spin_loops variable
 2005-01-05 12:43:48 +01:00
serg@sergbook.mysql.com
490d522408 fix alignment issues 2005-01-05 11:56:15 +02:00
serg@sergbook.mysql.com
4cbe322517 reverting the change that results in infinite recursion 2005-01-05 02:19:04 +02:00
serg@sergbook.mysql.com
11f445f9e4 federated: compilation errors and crash fixed. test still fails. 2005-01-05 00:39:13 +02:00
joreland@mysql.com
597ecc8e05 merge failure 2005-01-04 20:39:07 +01:00
joreland@mysql.com
c62ed85054 Merge 2005-01-04 19:12:01 +01:00
jimw@mysql.com
652fc10467 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-04 19:00:22 +01:00
bell@sanja.is.com.ua
a8a5f3590c fixed bugs in view code with prepared statemnts 2005-01-04 18:04:16 +02:00
tomas@poseidon.ndb.mysql.com
53acd15667 changed some NdbConnection to NdbTransaction 2005-01-04 13:47:16 +01:00
monty@mysql.com
7cf8285b3f After merge fixes 
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
 2005-01-04 13:46:53 +02:00
monty@mysql.com
3c6d5e43f9 Merge 2005-01-04 13:23:04 +02:00
jimw@mysql.com
050e229162 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-04 02:47:48 +01:00
jimw@mysql.com
954d0181ec Make query_cache_wlock_invalidate visible in SHOW VARIABLES (Bug #7594) 2005-01-04 02:45:01 +01:00
serg@sergbook.mysql.com
4da9825acd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-01-04 01:59:24 +02:00
joreland@mysql.com
8808669218 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-03 23:36:19 +01:00
serg@sergbook.mysql.com
b23a226151 mysql-test/r/multi_update.result, mysql-test/t/multi_update.test 
don't fail w/o bdb (or innodb)
sql/sql_base.cc
    typo fixed.
    "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
 2005-01-04 00:22:22 +02:00
monty@mysql.com
f499d330df Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-04 00:12:09 +02:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
joreland@mysql.com
3ffeca9a5c merge 5.0->5.0-ndb 2005-01-03 21:42:43 +01:00
bell@sanja.is.com.ua
8c39a4f463 fixed reporting error 2005-01-03 22:16:54 +02:00
monty@mysql.com
d35d4eab91 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-03 21:14:20 +02:00
monty@mysql.com
2299e1eca4 Better handling of ensuring that setup_tables() are not called twice 
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
 2005-01-03 21:04:33 +02:00
jimw@mysql.com
0e8d3f1ccd Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0
 2005-01-03 19:56:20 +01:00
jimw@mysql.com
98d7964d2a Fix 'SHOW CREATE FUNCTION' to say 'FUNCTION' in its error message. (Bug #6338) 2005-01-03 19:53:54 +01:00
monty@mysql.com
a981ca050d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-03 15:35:58 +02:00
serg@sergbook.mysql.com
5e18c54646 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-01-03 15:35:58 +02:00
mskold@mysql.com
9647a076a6 Merge 2005-01-03 14:33:00 +01:00
mskold@mysql.com
31360fb01a Merge for WL#2290 Add support for bit field in ndbcluster handler 2005-01-03 14:29:27 +01:00
mskold@mysql.com
ce103eeff7 Merge 2005-01-03 13:52:17 +01:00
serg@sergbook.mysql.com
e363e55b51 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-01-03 14:16:32 +02:00
monty@mysql.com
e205136170 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-03 13:57:17 +02:00
monty@mysql.com
ce456b6a20 Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases 
(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.
 2005-01-03 13:56:23 +02:00
mskold@mysql.com
8edd9baa2c Fixed failed merge 2005-01-03 11:56:51 +01:00
mskold@mysql.com
689748b548 Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2005-01-03 09:46:59 +01:00
monty@mysql.com
1e88bdbf90 Streamlined code for trim, ltrim and rtrim 
Portability fixes
 2005-01-02 23:31:37 +02:00
paul@snake-hub.snake.net
fc0d550bad set_var.cc: 
Silence compiler warning.
 2005-01-02 15:10:08 -06:00
monty@mysql.com
1cd4c06874 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-02 15:25:47 +02:00
serg@sergbook.mysql.com
f5d54d58b5 typo fixed 2005-01-02 15:23:34 +02:00
serg@sergbook.mysql.com
2c6bc59307 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-01-02 12:33:42 +02:00
mskold@mysql.com
3d50cc0457 Fixed failed merge 2005-01-01 22:47:50 +01:00
mskold@mysql.com
94845764ca Fixed failed merge 2005-01-01 22:40:40 +01:00
joreland@mysql.com
fe8f4ab012 merge 2005-01-01 14:01:37 +01:00
joreland@mysql.com
a7c2a9e0b8 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-01 09:13:17 +01:00
serg@sergbook.mysql.com
203cc19e48 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2004-12-31 18:00:49 +01:00
serg@sergbook.mysql.com
a9c7fb9dfd post-merge 2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00
mskold@mysql.com
20c89180fa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2004-12-31 13:50:04 +01:00
serg@sergbook.mysql.com
b8cbe63bfe Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2004-12-31 12:55:42 +01:00
dlenev@brandersnatch.localdomain
4e17aab243 Yet another after merge fix. 
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
 2004-12-31 14:02:40 +03:00
serg@sergbook.mysql.com
45ce994e5d post-merge 2004-12-31 11:52:14 +01:00
joreland@mysql.com
3c52b247ac Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2004-12-31 11:39:43 +01:00
dlenev@mysql.com
2f8dcec05a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-1339
 2004-12-31 13:33:00 +03:00
monty@mysql.com
78da7196ad Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-12-31 12:05:43 +02:00
monty@mysql.com
1bd22faa05 Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag 
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
 2004-12-31 12:04:35 +02:00
monty@mysql.com
e4ffff2918 Fix max_key_length and max_unique_length to take into account varchar and null extra lengths 
This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables
 2004-12-31 11:56:50 +02:00
dlenev@mysql.com
536cb92195 Manual merge. 2004-12-31 12:48:27 +03:00
joreland@mysql.com
7f6fb4d9de Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2004-12-31 10:07:49 +01:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f Merge bk-internal:/home/bk/mysql-5.0 
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
 2004-12-31 09:00:34 +01:00
joreland@mysql.com
8f2d0ec1a1 merge 2004-12-31 06:36:32 +01:00
monty@mysql.com
5e03ebbcad After merge fixes 
Cleanup of mi_print_error() handling
Deleted 'merge' directory
 2004-12-31 03:47:56 +02:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00