mskold@mysql.com
a2bcb2a558
Cleaned up rnd_init
2004-08-24 23:13:32 +02:00
serg@serg.mylan
19f7592206
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:37:03 +02:00
serg@serg.mylan
0dc5945b19
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 21:07:08 +02:00
konstantin@mysql.com
522a27069f
Merge: manual resolve
2004-08-24 23:07:08 +04:00
serg@serg.mylan
54520d9780
automerged
2004-08-24 18:22:33 +02:00
serg@serg.mylan
8f254c1b7b
followup
2004-08-24 18:20:27 +02:00
gluh@gluh.mysql.r18.ru
510cacbb77
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(for 4.1)
2004-08-24 20:18:59 +04:00
konstantin@mysql.com
ae18dc3ec8
Fix for Bug#5034 "prepared "select 1 into @arg15", second
...
execute crashes server": we were deleting lex->result
after each execute, but prepared statements assumed that
it's left intact.
The fix adds cleanup() method to select_result hierarchy,
so that result objects can be reused.
Plus we now need to delete result objects more wisely.
2004-08-24 20:17:11 +04:00
serg@serg.mylan
8f2d92c56a
manually merged
2004-08-24 17:24:23 +02:00
serg@serg.mylan
a302f88eb9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 17:24:05 +02:00
monty@mysql.com
46588eeb7a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-24 18:24:05 +03:00
monty@mysql.com
c44d4debfa
Portablity fixes & simple optimizations
2004-08-24 18:00:45 +03:00
serg@serg.mylan
50ee43be43
BDB: Bug#4531: unique key prefix interacts poorly with utf8,
...
Bug#4594 column index make = failed for gbk
2004-08-24 15:32:57 +02:00
gluh@gluh.mysql.r18.ru
1786a388e4
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(2nd version)
2004-08-24 17:29:08 +04:00
paul@kite-hub.kitebird.com
25266b845f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-24 07:22:16 -05:00
sergefp@mysql.com
908ff0495d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
2004-08-24 15:29:10 +04:00
sergefp@mysql.com
d970586fef
Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR
2004-08-24 14:44:15 +04:00
hf@deer.(none)
43a853dd4d
Merging
2004-08-24 12:58:21 +05:00
rburnett@build.mysql.com
95a51bca95
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-24 00:45:03 +02:00
monty@mysql.com
3808e4a5cf
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-24 01:09:24 +03:00
monty@mysql.com
7ff0cef3f1
Fixed uninitialized variable
...
Fixed error messages
2004-08-24 01:08:48 +03:00
rburnett@build.mysql.com
990c5857e5
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-23 22:01:16 +02:00
bell@sanja.is.com.ua
3b65ce7489
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:32:38 +03:00
bell@sanja.is.com.ua
6fcd27e9cd
after review fixes:
...
allowed parsing of table fields inside aggregate functions
added new tests of fields resolving in grouping
2004-08-23 22:31:01 +03:00
paul@kite-hub.kitebird.com
917aa465e2
mysqld.cc:
...
System variable names use underscores, not dashes.
Alphabetize variables in option struct for help message.
(will wait for okay to push)
2004-08-23 14:30:55 -05:00
rburnett@build.mysql.com
680aa3d69d
Bug #4629 Crash after SLAVE STOP, if the IO thread is in special state.
...
client.c:
Removed call to clear_slave_vio in end_server(). Removed header declaration of clear_slave_vio
slave.cc:
Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()
2004-08-23 18:55:12 +02:00
gluh@gluh.mysql.r18.ru
7b17daf21e
Fix for bug #5134 : WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree)
2004-08-23 20:17:14 +04:00
guilhem@mysql.com
7bfc78f573
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-23 17:16:22 +02:00
gluh@gluh.mysql.r18.ru
7ff0c3978c
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
2004-08-23 19:16:21 +04:00
gluh@gluh.mysql.r18.ru
23535cce16
Fix for bug #5134 : WHERE x = 'bar' AND x LIKE BINARY 'bar' returns
...
wrong results
2004-08-23 19:13:47 +04:00
bar@mysql.com
0983295859
Bug#4594: column index make = failed for gbk, but like works
...
Fix for HEAP+HASH prefix keys.
2004-08-23 20:12:39 +05:00
tomas@poseidon.(none)
b8dfb7eaf1
reverted default setting of --ndbcluster if --ndb-connectstring is given
2004-08-23 15:12:38 +00:00
guilhem@mysql.com
252ebd2b30
Fix for BUG#5033 "When using temporary tables truncate does NOT reset the auto_increment counter"
...
(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions.
2004-08-23 16:15:57 +02:00
pem@mysql.com
66a3f65d98
Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0)
2004-08-23 15:29:55 +02:00
bell@sanja.is.com.ua
3ca433e332
merge
2004-08-23 15:50:59 +03:00
monty@mysql.com
f585ccb2ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-23 13:47:52 +03:00
monty@mysql.com
309d691e65
Changed %lx -> 0x%lx (for easier comparison of debug files)
...
Cosmetic cleanups
Don't call 'delete_elements' on copy_funcs as this causes elements to be freed twice
2004-08-23 13:46:51 +03:00
serg@serg.mylan
52731bec19
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 11:15:44 +02:00
sergefp@mysql.com
a309f76128
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
2004-08-23 13:15:43 +04:00
tomas@poseidon.(none)
efac41149c
small ndb switch fix
2004-08-23 09:15:42 +00:00
serg@serg.mylan
a64ac380b5
better for for bug#4767
2004-08-23 10:53:53 +02:00
tomas@poseidon.(none)
552d841be2
stylistic fixes
2004-08-23 08:42:31 +00:00
sergefp@mysql.com
263f2e3fe2
Fix for bug#5088:
...
* When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
* In remove_const, don't remove conditions that depend on some-const-table and current-table.
2004-08-23 12:31:56 +04:00
bell@sanja.is.com.ua
74d7a092b2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-08-23 10:59:35 +03:00
tomas@poseidon.(none)
05853d95de
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-23 07:33:40 +00:00
serg@serg.mylan
f0fffbe21b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-22 14:24:45 +02:00
serg@serg.mylan
326992430f
check for mysql_bin_log.is_open() before my_b_tell(&thd->transaction.trans_log
...
in ha_commit_trans - why it didn't crash earlier ?
2004-08-22 14:23:52 +02:00
hf@deer.(none)
6c136f99bf
Proposed fix for bug #5003 (subselect with MIN() and LIKE crashes server)
...
We have next problem here:
active_index is wrong in the subselect's handler on the second val_int() call.
Optimizer sees that we can use index-read for that kind of condition,
and matching_cond() (sql/opt_sum.cc) doesn't. I suspect, proper solution is
to add appropriate code to the matching_cond() but now just added
missed initialization.
2004-08-22 00:06:19 +05:00
paul@ice.snake.net
8f43d0c4b2
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-21 12:35:33 -05:00
igor@rurik.mysql.com
4b760fcb94
null.test, null.result:
...
Added test case for bug #4256 .
join_outer.result:
Fixed bug #4256 .
item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects.
This inconsistency caused bug #4256 .
2004-08-20 23:48:30 -07:00