Commit graph

10356 commits

Author SHA1 Message Date
konstantin@mysql.com
0ca7f54b5e Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-4.1-max_prep_stmt_count
2003-12-05 02:00:54 +03:00
konstantin@oak.local
a942f55716 unused variable max_prep_stmt_count removed 2003-12-05 01:55:57 +03:00
serg@serg.mylan
cbcb863ca5 test result fixed 2003-12-04 23:18:04 +01:00
serg@serg.mylan
b193d20001 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-04 22:07:04 +01:00
serg@serg.mylan
3f1d0acbad make a clear distinction between max_word_length in *characters* and in *bytes* 2003-12-04 21:58:28 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1f02484341 Fixup error number - Broke during merge 2003-12-04 18:09:36 +00:00
greg@mysql.com
b83f2bd350 Merge gweir@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/bk/mysql-4.1
2003-12-04 11:54:53 -05:00
greg@mysql.com
66f777d36c Add charset #defines for Windows platform (as of 4.1.1) 2003-12-04 11:54:04 -05:00
konstantin@oak.local
bab592c3c0 comment to user-level lock added 2003-12-04 19:12:01 +03:00
lenz@kallisto.local
84acc2054f - Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha
- tagged ChangeSet 1.1641 as "mysql-4.1.1"
2003-12-04 15:20:44 +01:00
paul@ice.snake.net
93f84357c0 README:
minor edits
2003-12-03 21:10:44 -06:00
paul@ice.snake.net
96ff6cde3f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-12-03 11:51:57 -06:00
paul@ice.snake.net
5d323303cb Delete obsolete references. 2003-12-03 11:48:34 -06:00
lenz@mysql.com
6cd58f43b5 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-12-03 11:07:02 +01:00
paul@ice.snake.net
fa432b3d79 benchmarks README edits 2003-12-02 18:14:56 -06:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
55d4248dae Merge for update 2003-12-02 20:57:34 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2 WorkLog#1280 - Remove fixed table handler from lex/yacc 2003-12-02 20:23:13 +00:00
konstantin@mysql.com
1be4a37fa2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-02 18:06:25 +03:00
hf@deer.(none)
02f382ecaa Fix for #1189 (Mess with names about CONSTRAINT)
Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified
2003-12-02 19:06:24 +04:00
lenz@kallisto.local
80deee256c - removed INSTALL-WIN-SOURCE from the BK tree as its content has been
added to manual.texi - extract it from there instead.
2003-12-02 15:56:18 +01:00
konstantin@oak.local
c10413abda Item_param::save_in_field():
thd->command can be anything except COM_EXECUTE in no cases
except programming error.
2003-12-02 15:09:35 +03:00
monty@mysql.com
05e4d9031b Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines 2003-12-02 13:32:05 +02:00
konstantin@mysql.com
f274f72c98 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-02 13:10:25 +03:00
igor@rurik.mysql.com
dcbbbe6b94 join_outer.result, null.result, null.test, item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).
2003-12-01 13:59:09 -08:00
konstantin@oak.local
f35787b628 cleanup: unused variable removed
followup of Bordeaux Optimizer session
2003-12-01 20:53:05 +03:00
konstantin@mysql.com
eb27c16d8b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-01 20:23:46 +03:00
konstantin@oak.local
2d52be9fdf don't delete select_lex->having and select_lex->where as we delete
all items in free_prep_stmt(free_items);

indentation fix
2003-12-01 17:46:07 +03:00
monty@mysql.com
f266cdabab Portability fixes (for binary build)
Added --protocol to mysqlbinlog
2003-12-01 13:13:16 +02:00
monty@mysql.com
3ee758497f Mark position as # to make test portable 2003-11-28 21:05:53 +02:00
monty@mysql.com
a7610584d6 Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1 2003-11-28 20:44:26 +02:00
monty@mysql.com
cad6b7c8be rpl_parse and rpl_probe don't have to be reset as they are already 0 2003-11-28 20:41:33 +02:00
monty@mysql.com
2931e100c1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-28 19:43:30 +02:00
serg@serg.mylan
77d137a24a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 18:18:58 +01:00
serg@serg.mylan
d2e065022f "optimization cleanup" reverted - problems on rpl_redirect test.
It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)
2003-11-28 18:15:58 +01:00
guilhem@mysql.com
398c8de8fa Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-28 16:22:45 +01:00
guilhem@mysql.com
c9fd311aac In the slave I/O thread (in master.info), it seems less worse to flush
the relay log before flushing master.info.
Doing 'before' leads to duplicate event, doing after leads to missing event.
Both can be as destructive, but 'duplicate' enables us to later add detection
code to catch it. Whereas 'missing' can't be caught (it can't, because
the I/O thread can produce legal position jumps, for example if it has
ignored an event coming from this slave (rememember that starting from 4.1.1,
the I/O thread filters the server id).
2003-11-28 16:15:21 +01:00
konstantin@mysql.com
4e370c333a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-28 17:28:48 +03:00
konstantin@oak.local
e149e63334 cleanup: comment moved to proper place 2003-11-28 17:28:04 +03:00
monty@mysql.com
5914033478 merge with 4.0 to get fix for range bug 2003-11-28 15:55:43 +02:00
monty@mysql.com
1976b25dc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-11-28 15:45:57 +02:00
monty@mysql.com
4f42a47408 Fixed range optimzier bug (Bug #1828) 2003-11-28 15:45:34 +02:00
monty@mysql.com
8e613176b5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-28 14:47:33 +02:00
monty@mysql.com
320fcb0ef6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-28 14:23:54 +02:00
serg@serg.mylan
ffb499927c Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 12:51:15 +01:00
serg@serg.mylan
594f4c35de Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-11-28 12:51:10 +01:00
serg@serg.mylan
3b49d34f97 merged 2003-11-28 12:49:58 +01:00
serg@serg.mylan
16e5b4f0ba bug #1945. item(expression)->name=0, crash in find_item_in_list 2003-11-28 12:36:45 +01:00
monty@mysql.com
7f9466a717 Merge 2003-11-28 13:31:38 +02:00
monty@mysql.com
6a3e29c865 Fix wrong last edit for last commit 2003-11-28 13:15:42 +02:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00