Commit graph

21937 commits

Author SHA1 Message Date
reggie@mdk10.(none)
9506fb97b5 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 14:17:29 -05:00
marko@hundin.mysql.fi
a0af6bb7f5 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-04-08 22:17:28 +03:00
pem@mysql.comhem.se
2038ced40c Fixed BUG#9073: Able to declare two handlers for same condition in same scope 2005-04-08 19:58:04 +02:00
mskold@mysql.com
0ee6e48b22 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-08 19:57:07 +02:00
mskold@mysql.com
e8f45332bd Merge 2005-04-08 19:42:57 +02:00
pem@mysql.com
e6d72f1c48 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-08 17:32:50 +02:00
pem@mysql.comhem.se
ce2e40ac19 Fixed BUG#6900: Stored procedure inner handler ignored
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
2005-04-08 17:31:37 +02:00
mskold@mysql.com
497f2684d8 Merge from fix of Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-08 16:49:14 +02:00
reggie@mdk10.(none)
3f5b8b976c Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
2005-04-08 09:17:19 -05:00
reggie@mdk10.(none)
56bb135123 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 09:17:18 -05:00
joerg@mysql.com
ea39dffb9f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-08 16:17:17 +02:00
pem@mysql.comhem.se
e99da54fd5 Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions 2005-04-08 16:05:16 +02:00
joerg@mysql.com
55ee7b9253 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11 2005-04-08 16:04:37 +02:00
joreland@mysql.com
d8a5305d0d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-08 14:16:57 +02:00
joreland@mysql.com
72d89cc253 bug#9749 - ndb
test case for case 9749, ndb lock upgrade via NDBAPI
2005-04-08 14:15:37 +02:00
joerg@mysql.com
6bd1bea723 Add missing parts for the "Cybozu" custom build, to avoid future manual patches. 2005-04-08 13:56:48 +02:00
mskold@mysql.com
20a82a1a6a Fixed broken auto_increment 2005-04-08 12:34:52 +02:00
mskold@mysql.com
7c38f9d8e7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-08 11:50:01 +02:00
mskold@mysql.com
817f2c6a13 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-08 11:39:22 +02:00
mskold@mysql.com
813cc0eaf0 Added more tests for auto_increment 2005-04-08 11:38:40 +02:00
reggie@mdk10.(none)
c55a7b651f Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.
2005-04-08 00:16:02 -05:00
hf@deer.(none)
eae3f5ba1d Test result fixed 2005-04-08 09:23:10 +05:00
hf@deer.(none)
33cd3168fb Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-08 08:31:53 +05:00
monty@mysql.com
211638f539 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-08 00:56:29 +03:00
msvensson@neptunus.(none)
f9dd856d9e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 21:29:33 +02:00
lenz@mysql.com
d936a80cea - bumped up the version number in configure.in from 5.0.4 to 5.0.5 to indicate that engineering
has branched off from the 4.1 tree to build the 5.0.4 release
2005-04-07 21:04:18 +02:00
monty@mysql.com
551ebb8a60 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-07 22:02:24 +03:00
msvensson@neptunus.(none)
960410274c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-07 20:21:17 +02:00
msvensson@neptunus.(none)
7a0e28feb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145 BUG#6762 ALTER TABLE gives weird results and error message
- Removed hardcoded error message from 4.1
2005-04-07 20:17:37 +02:00
mskold@mysql.com
600154704f Merge 2005-04-07 20:10:50 +02:00
mskold@mysql.com
b716302860 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
mskold@mysql.com
8327593bfd Merge 2005-04-07 19:48:00 +02:00
jimw@mysql.com
43d926029f Add cp932 and eucjpms character sets to Windows build. (Bug #9479) 2005-04-07 09:51:56 -07:00
mskold@mysql.com
e66eaaa2a0 Merge 2005-04-07 18:37:04 +02:00
monty@mysql.com
740cc2e095 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-07 19:25:20 +03:00
monty@mysql.com
780202f130 Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
2005-04-07 19:24:14 +03:00
mskold@mysql.com
b135b175fa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-07 17:51:53 +02:00
mskold@mysql.com
89b140340c Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
hf@deer.(none)
a8f80a8001 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:30:14 +05:00
hf@deer.(none)
345b6d476a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:25:13 +05:00
sergefp@mysql.com
280fda6093 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
2005-04-07 17:48:42 +04:00
sergefp@mysql.com
3f6cdec788 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8877
2005-04-07 17:47:37 +04:00
sergefp@mysql.com
3005323e99 Merge mysql.com:/home/psergey/mysql-4.1-bug8877
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
2005-04-07 17:46:08 +04:00
sergefp@mysql.com
0cd5877b02 Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
sergefp@mysql.com
b591d3434a BUG#8877: Post-merge fixes. 2005-04-07 17:42:32 +04:00
magnus@msdesk.mysql.com
7de662074a Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into msdesk.mysql.com:/home/magnus/mysql-5.0
2005-04-07 15:13:03 +02:00
magnus@msdesk.mysql.com
fb1827d623 Merge msdesk.mysql.com:/home/magnus/mysql-5.0-build
into msdesk.mysql.com:/home/magnus/mysql-5.0
2005-04-07 15:11:30 +02:00
magnus@msdesk.mysql.com
9911194a13 Fix linking problem on bsd53
- See article http://archive.netbsd.se/?ml=freebsd-current&a=2004-07&m=257561
  or http://www.geocrawler.com/archives/3/254/2003/3/450/10409564/
2005-04-07 14:39:30 +02:00
bar@mysql.com
b950bc210c ctype-eucjpms.c:
After merge fix.
2005-04-07 16:14:45 +05:00