serg@serg.mylan
6d0703ab5b
QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status
2003-12-06 23:21:09 +01:00
serg@serg.mylan
95bdc62bea
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-06 19:05:57 +01:00
serg@serg.mylan
b2e6b36487
fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
...
(isn't it obvious ?)
2003-12-06 19:05:26 +01:00
pem@mysql.comhem.se
301d8137c0
New test cases for BUG#1653 (recalling a procedure after replacing a faulty
...
table definition crashed), and recursive calls.
2003-12-05 18:52:33 +01:00
pem@mysql.comhem.se
cbdc0b4c3a
Post-merge fixes.
2003-12-05 14:45:48 +01:00
pem@mysql.com
63f4858030
Merged 4.1 -> 5.0
2003-12-05 13:11:50 +01:00
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
konstantin@oak.local
a1c593f141
cleanup
2003-12-05 00:56:28 +03: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
konstantin@oak.local
b6a9ba5b45
after-review fixes
2003-12-04 22:08:26 +03: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
konstantin@mysql.com
f2377c4dc9
manual merge
2003-12-04 18:15:45 +03:00
pem@mysql.comhem.se
98bfc5a6c6
Fixed another compiler error on HP-UX.
2003-12-04 15:54:37 +01:00
pem@mysql.com
c57cebfe2a
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2003-12-04 15:21:57 +01: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
pem@mysql.comhem.se
a5780a4815
Fixed BUG#336: Subselects with tables does not work as values for local SP variables
...
and BUG#1654: Stored Procedure Crash if contains subquery and set function
Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
The latter should work, but turned out to be difficult to fix, so we just
disallow it for the time being.
2003-12-04 15:17:55 +01:00
lenz@kallisto.local
b1406b3be6
- Added missing backslash to sql/Makefile.am that prevented the sp_* header
...
files from being included in the source distribution
2003-12-04 12:02:18 +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
sergefp@mysql.com
e375fade90
Merge mysql.com:/home/psergey/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-compile
2003-12-02 21:31:46 +03:00
sergefp@mysql.com
43221ad9e1
Fix for bug #1980
2003-12-02 21:20:51 +03:00
pem@mysql.com
2c16ccdbe6
Merge mysql.com:/home/pem/work/mysql-4.1
...
into mysql.com:/home/pem/work/mysql-5.0
2003-12-02 17:08:24 +01: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
e282c8cc6f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-1
2003-12-01 16:20:46 -08:00
igor@rurik.mysql.com
37ad3d2f2d
index_merge.result:
...
Fixed inconsistency of values of used_tables_cache
and const_item_cache for Item_func_isnull objects (bug #1990 ).
2003-12-01 16:15:25 -08:00
igor@rurik.mysql.com
441ad81b48
join_outer.result, null.result, null.test:
...
Fixed inconsistency of values of used_tables_cache
and const_item_cache for Item_func_isnull objects (bug #1990 ).
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 16:12:05 -08: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
pem@mysql.comhem.se
3ed561d3cf
Post-merge fixes.
2003-12-01 18:24:09 +01: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
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01: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