stewart@mysql.com
c4c3e1dd27
GCC4 build fix
2005-09-22 16:35:03 +10:00
jonas@perch.ndb.mysql.com
e84173a1eb
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:19:09 +02:00
jonas@perch.ndb.mysql.com
36dae073b3
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:17:41 +02:00
jonas@perch.ndb.mysql.com
4009307f0b
ndb - fix gcc4 compile problem
2005-09-22 07:11:53 +02:00
jimw@mysql.com
7ecafbb9f5
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-21 17:05:35 -07:00
jimw@mysql.com
bdb4502a78
Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-21 15:17:48 -07:00
evgen@moonbone.local
5065d73ebb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13180-bug-4.1-mysql
2005-09-22 01:48:39 +04:00
evgen@moonbone.local
b7e8c8b112
Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.
...
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.
thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and
reset_stmt_for_execute().
2005-09-22 01:38:39 +04:00
bar@mysql.com
d870612ac0
Bug#13046: LIKE pattern matching using prefix
...
index doesn't return correct result
item_cmpfunc.cc:
Use charset of LIKE to decide whether
to use 8bit or Unicode "escape" value.
But use charset of "escape" to scan escape character.
strings/ctype-xxx.c:
We cannot reduce "end" pointer using charpos(),
because of possible escape characters in the string.
Limit the loop using count of written characters instead.
ctype_like_escape.inc:
new file
mysql-test/t/ctype_xxx:
mysql-test/r/ctype_xxx:
Adding test case.
2005-09-21 23:10:51 +05:00
sergefp@mysql.com
2b528d8364
Fix compiler error: C++ code in C
2005-09-21 19:58:40 +04:00
timour@mysql.com
ba9e3ca1a4
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-09-21 18:58:39 +03:00
jonas@perch.ndb.mysql.com
e50c49b2b9
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-21 17:58:38 +02:00
jonas@perch.ndb.mysql.com
ed8f33f057
bug#12950
...
ndb backup with charsets and simultanious updates
make sure that backup _dont_ read xfrm data
2005-09-21 17:24:39 +02:00
stewart@mysql.com
6960e0a7fd
BUG#11595 ndb_mgm shows from IP for second mgmd
...
BUG#12037 ndb_mgmd IP address do not show in other ndb_mgmd processes
Extend ApiVersionConf to include address.
2005-09-22 00:41:46 +10:00
monty@mysql.com
aaecf69525
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-09-21 17:28:51 +03:00
monty@mysql.com
1bd2beff5a
Ensure that hex strings are used as integers in cast(... signed/unsigned)
...
This fixes the new report for bug #7036
2005-09-21 17:28:25 +03:00
jonas@perch.ndb.mysql.com
d1ee898d34
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-21 14:39:28 +02:00
ramil@mysql.com
c2be8dccff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b7589
2005-09-21 14:33:39 +05:00
ramil@mysql.com
986a51e447
a fix (bug #7589 : Decimal types are ignored when updating data from another column).
2005-09-21 14:32:19 +05:00
msvensson@neptunus.(none)
f6b8032af5
Don't add all args to mysqltest to MYSQL_TEST env var
2005-09-21 10:24:46 +02:00
timour@mysql.com
6ae8a56f72
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-09-21 09:53:42 +03:00
timour@mysql.com
633d118d01
Fix for BUG#12882 - min/max inconsistent on empty table.
...
The problem was in that the MIN/MAX optimization in opt_sum_query was
replacing MIN/MAX functions with their constant argument without
taking into account that a query has no result rows.
2005-09-21 09:49:19 +03:00
jimw@mysql.com
743cad72f6
Fix handling of password field at the old size (16 characters) but in
...
the UTF-8 character set. (Bug #13064 )
2005-09-20 16:57:58 -07:00
sergefp@mysql.com
a26e1b7280
Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
2005-09-21 02:20:55 +04:00
sergefp@mysql.com
f9475d1d15
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
...
statistics (like 4.0 did) (patch #3 , with review #1 & #2 feedback addressed)
2005-09-21 02:18:29 +04:00
jimw@mysql.com
a778669efd
Tweak kill test to avoid spurious test failure on SCO OpenServer. (Bug #12136 )
2005-09-20 09:36:35 -07:00
SergeyV@selena.
c2f734ce42
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#12929-mysql-4.1
2005-09-20 20:11:38 +04:00
SergeyV@selena.
988c8e92d8
Small update for lock functions used in my_cgets()
2005-09-20 20:03:51 +04:00
tomas@poseidon.ndb.mysql.com
d0c578294e
Bug #10694 LOAD DATA FROM INFILE fails with 'Out of operation records'
2005-09-20 14:20:02 +02:00
msvensson@neptunus.(none)
523d2aad94
BUG#12959 mysqltest crashes if testcase passed with -x option
...
- Enable testcases after help from Serg
2005-09-20 14:11:58 +02:00
msvensson@neptunus.(none)
913f0bd610
Improved output
2005-09-20 12:13:17 +02:00
jonas@perch.ndb.mysql.com
8983e39070
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-20 09:50:10 +02:00
stewart@mysql.com
dcb3e5975b
Remove old and usused configuration locking code.
...
Some new code that does this job is being written against 5.1. This code is
largely removed from that work.
2005-09-20 17:34:46 +10:00
jonas@perch.ndb.mysql.com
992620318c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-20 00:26:23 +02:00
jonas@perch.ndb.mysql.com
3d520d22ce
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-20 00:25:33 +02:00
sasha@asksasha.com
c4f16269f3
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
2005-09-19 15:45:01 -06:00
evgen@moonbone.local
9fe540fa13
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13218-bug-4.1-mysql
2005-09-19 23:46:39 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
7c57c41a06
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-19 19:33:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
a8bdf632d3
Fixed Bug#13275 mysqltest empty file bug
2005-09-19 18:45:22 +03:00
jonas@perch.ndb.mysql.com
668a192ce5
ndb - imlp. show engine ndb status;
...
that dump free list allocation per connection
2005-09-19 15:35:07 +02:00
jonas@perch.ndb.mysql.com
5c836e2ab7
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-19 15:00:13 +02:00
kent@mysql.com
76956fdf90
mysql-test-run.pl:
...
Added flag --valgrind-mysqltest
2005-09-19 14:58:06 +02:00
jonas@perch.ndb.mysql.com
e358a81710
bug#9282 - ndb
...
big delete from causing NdbObjectIdMap::expand at same time
as receiver thread perform getObjectId
2005-09-19 14:05:54 +02:00
msvensson@neptunus.(none)
c18980aeb6
Clean up printout of line numbers
2005-09-19 12:24:59 +02:00
evgen@moonbone.local
afa8187fb7
Fix bug #13218 : InnoDB: using a partial-field key prefix in search
...
This is backport from 5.0 of fix for bug #11039
2005-09-19 04:39:49 +04:00
paul@snake-hub.snake.net
15bf8f6ada
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
2005-09-18 13:24:27 -05:00
paul@snake-hub.snake.net
1cac0cb6f1
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
2005-09-18 13:18:09 -05:00
paul@snake-hub.snake.net
e142347c89
.del-which.2~463417adb2e37122:
...
Delete: man/which.2
2005-09-18 13:16:32 -05:00
sasha@asksasha.com
c87bc3ef64
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
2005-09-17 18:46:54 -06:00
jonas@perch.ndb.mysql.com
c3d07de037
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-17 10:05:07 +02:00