msvensson@neptunus.(none)
c4a86761b0
Replace the --exec in a while loop that causes 3400 executions of cygwin/bash on
...
windows with a small perl script that does exactly the same.
2007-01-17 13:43:03 +01:00
kostja@bodhi.local
175438819a
Fix a ps.test failure in 5.0-runtime tree.
2007-01-17 14:24:54 +03:00
msvensson@pilot.mysql.com
92d60d9bab
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-engines
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines
2007-01-17 12:24:43 +01:00
msvensson@pilot.mysql.com
543bc0165f
Bug#21122 SHOW CREATE TABLE: directory output only sometimes
...
Bug #25000 myisam.test fails on 'pb-valgrind-*' Valgrind
- Move tests that need symlink to symlink.test
2007-01-17 12:22:00 +01:00
msvensson@pilot.mysql.com
3b8695911c
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-17 12:14:34 +01:00
msvensson@pilot.mysql.com
248c768230
Cset exclude: msvensson@pilot.mysql.com|ChangeSet|20070117102733|42618
2007-01-17 12:12:24 +01:00
msvensson@pilot.mysql.com
51292deb36
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-17 11:53:00 +01:00
msvensson@pilot.mysql.com
29be5ce836
Bug#25505 Myisam library compiler error on Windows
2007-01-17 11:51:52 +01:00
msvensson@pilot.mysql.com
55ed38e533
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060825084614|09755
2007-01-17 11:27:33 +01:00
msvensson@pilot.mysql.com
8154355a07
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-01-17 11:13:03 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
b1fdb7bce4
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
2007-01-17 10:42:57 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
2fed34d7ea
ha_ndbcluster.cc:
...
Bug #25668 - corrected patch after test failures
2007-01-17 10:41:52 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
6a83d18c28
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
2007-01-17 10:07:45 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
1d6fe0ffaa
ha_ndbcluster.cc:
...
Bug #25668 ndb: mysqld may core if cluster disconnected
-- pTrans may be NULL, remove not needed usage of handler::ndb_err
2007-01-17 10:06:50 +01:00
svoj@mysql.com/june.mysql.com
ba6537ea8b
Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines
2007-01-17 12:59:54 +04:00
df@kahlann.erinye.com
27f6578f6b
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2007-01-17 09:07:12 +01:00
joerg@trift2.
88bc918be6
myisam/mi_packrec.c
...
Fix a compile error: Macro "DBUG_ENTER" must not follow an executable statement.
2007-01-16 20:01:17 +01:00
kostja@bodhi.local
76dfe0bc08
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-16 21:31:59 +03:00
kostja@bodhi.local
51a2f5153f
A fix for the broken 4.1-runtime tree.
2007-01-16 21:23:52 +03:00
msvensson@neptunus.(none)
77b0123882
Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-16 17:53:45 +01:00
msvensson@neptunus.(none)
c36a5390e4
Update xid's as an effect of not closing the prepared statements all the time
2007-01-16 17:52:17 +01:00
msvensson@neptunus.(none)
ae03f5d382
Don't reuse prepared statements if running with reconnect enabled
2007-01-16 17:47:41 +01:00
svoj@mysql.com/june.mysql.com
c606e30f35
BUG#24855 - Crash mysqld 4.1.21 with corrupted tables
...
Accessing fixed record format table with crashed key definition results
in server/myisamchk segmentation fault.
This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.
2007-01-16 18:05:37 +04:00
msvensson@neptunus.(none)
11ddeb693d
Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-16 14:13:48 +01:00
msvensson@neptunus.(none)
f507bb2cb3
Bug#15518 Reusing a stmt that has failed during prepare does not clear error
...
- Always reset error when calling mysql_stmt_prepare a second time
- Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server.
- Add test to mysql_client_test
- Remove mysql_stmt_close in mysqltest after each query
- Close all open statements in mysqltest if disable_ps_protocol is called.
2007-01-16 13:39:42 +01:00
joerg@trift2.
25c53269ab
configure.in : Fix a dependency problem for "extra/" which shows up only in RPM builds.
2007-01-16 12:46:48 +01:00
msvensson@neptunus.(none)
47583ddf3e
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-16 09:35:53 +01:00
msvensson@neptunus.(none)
f44d73a58d
Always use two masters for ndb tests
2007-01-16 09:35:14 +01:00
dlenev@mockturtle.local
693bc6a233
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
2007-01-16 07:25:23 +03:00
malff/marcsql@weblab.(none)
47dff35dd1
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
2007-01-15 16:24:30 -07:00
kostja@bodhi.local
226fa85635
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-15 23:37:38 +03:00
kostja@bodhi.local
6e16458487
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-15 23:29:02 +03:00
kostja@bodhi.local
d49ac4fbb7
A post-merge fix.
2007-01-15 23:25:16 +03:00
bteam/mysqldev@mysql.com/production.mysql.com
b711c554f5
Raise version number after cloning 5.0.34
2007-01-15 16:57:22 +01:00
iggy@recycle.(none)
db79dd6b73
Merge recycle.(none):/src/bug19424/my50-bug19424
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-15 10:15:43 -05:00
iggy@recycle.(none)
f10a24314d
Bug#19424 InnoDB: Possibly a memory overrun of the buffer being freed (Win64)
...
- Re-enabling optimization on all except innodb/mem/*.
2007-01-15 10:00:29 -05:00
joerg@trift2.
17056a63c7
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-15 12:13:11 +01:00
dlenev@mockturtle.local
af838b4c55
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
2007-01-15 13:48:07 +03:00
kostja@bodhi.local
8659035f86
Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
...
into bodhi.local:/opt/local/work/mysql-5.0-4968-to-push
2007-01-15 13:12:37 +03:00
kostja@bodhi.local
d7a63c0f6a
Manual merge.
2007-01-15 13:10:07 +03:00
kostja@bodhi.local
d53072d190
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
2007-01-15 13:03:21 +03:00
df@kahlann.erinye.com
51936c964a
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2007-01-15 10:43:32 +01:00
dlenev@mockturtle.local
ab98cbc88a
Fix for bug#20390 "SELECT FOR UPDATE does not release locks
...
of untouched rows in full table scans".
SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as
UPDATE/DELETE statements which were executed using full table
scan were not releasing locks on rows which didn't satisfy
WHERE condition.
This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables
intentionally don't support such unlocking in default mode).
This problem occured because code implementing join didn't call
handler::unlock_row() for rows which didn't satisfy part of condition
attached to this particular table/level of nested loop. So we solve
the problem adding this call.
Note that we already had this call in place in 4.1 but it was lost
(actually not quite correctly placed) when we have introduced nested
joins.
Also note that additional QA should be requested once this patch is
pushed as interaction between handler::unlock_row() and many recent
MySQL features such as subqueries, unions, views is not tested enough.
2007-01-15 12:32:38 +03:00
kostja@bodhi.local
7c298786f1
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-12 22:01:53 +03:00
kostja@bodhi.local
5a99ffdf92
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-12 21:59:17 +03:00
joerg@trift2.
ba876c4278
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-12 16:16:17 +01:00
kostja@bodhi.local
a7862496ce
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2007-01-12 18:06:43 +03:00
joerg@trift2.
4ffada35bf
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into trift2.:/MySQL/M41/mysql-4.1
2007-01-12 14:40:28 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c380de50ef
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-01-12 12:22:54 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
22398faa91
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-01-12 12:21:44 +01:00