Commit graph

37947 commits

Author SHA1 Message Date
tsmith/tim@siva.hindu.god
f269d9b6c3 Applied innodb-5.1 snapshots ss799 and ss854
Bugs fixed:
- Bug #20877: InnoDB data dictionary memory footprint is too big
- Bug #13544: Second delete of same row in transaction illustrates non-optimal locking
- Bug #20791: valgrind errors in InnoDB
2006-09-21 01:39:09 -06:00
tsmith/tim@siva.hindu.god
ec720a5800 Fix typos, evidently from previous bad merges, in mysql-test-run.pl and sql_yacc.yy 2006-09-21 01:33:50 -06:00
msvensson@shellback.(none)
1c4c34bc39 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 20:04:42 +02:00
msvensson@shellback.(none)
30e3cce970 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 20:01:40 +02:00
msvensson@shellback.(none)
be1187e171 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-19 19:58:51 +02:00
msvensson@shellback.(none)
5a912955d5 Increase suite timeout even more - 6 times - when running with valgrind 2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
bd6fc1ce66 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 19:10:31 +02:00
msvensson@shellback.(none)
d8870f2bb3 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-19 18:41:48 +02:00
msvensson@shellback.(none)
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
msvensson@shellback.(none)
ee5ca6e231 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 17:47:53 +02:00
msvensson@shellback.(none)
1b3094187a Fix warnings in mysql-test-run.pl 2006-09-19 17:45:27 +02:00
msvensson@shellback.(none)
0e7d18d8e4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-19 17:08:07 +02:00
msvensson@shellback.(none)
895d986266 Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
The pid file will be removed later when var/ directory is recreated.
2006-09-19 16:48:01 +02:00
msvensson@shellback.(none)
fa26e83fd2 Fix warnings in mysql-test-run.pl 2006-09-19 16:43:42 +02:00
thek@kpdesk.mysql.com
a2467400b7 Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my51-bug21139
2006-09-19 12:42:44 +02:00
thek@kpdesk.mysql.com
b4908ed35d Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
2006-09-19 12:41:15 +02:00
thek@kpdesk.mysql.com
66fa757e1f Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
2006-09-19 12:40:31 +02:00
msvensson@shellback.(none)
de3a2e9237 Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 08:22:42 +02:00
msvensson@shellback.(none)
efcb56cb79 Bug#19738 "make install" tries to build files that "make" should already have built
- Remove the wildcard dependcy on the charset xml files
2006-09-19 08:15:42 +02:00
msvensson@shellback.(none)
dcb83c8300 Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 21:55:56 +02:00
msvensson@shellback.(none)
af323655b7 Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into  shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
2006-09-18 21:15:38 +02:00
msvensson@shellback.(none)
b50c843b25 BUG#19738 "make install" tries to build files that "make" should already have built
- Make built sources only depend on it's sources not the built tool
2006-09-18 21:11:34 +02:00
msvensson@shellback.(none)
17bc383ea5 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 19:48:04 +02:00
msvensson@shellback.(none)
da8fb51350 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-18 19:40:12 +02:00
msvensson@shellback.(none)
db1adb2234 Fix merge error, path_mysock has been renamed to path_sock 2006-09-18 19:38:59 +02:00
msvensson@shellback.(none)
2b014bedaf Add directive to not update files from bitkeeper 2006-09-18 19:37:22 +02:00
msvensson@shellback.(none)
7dabd8c683 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 18:06:10 +02:00
msvensson@shellback.(none)
8244e4fb73 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-18 18:04:47 +02:00
msvensson@shellback.(none)
dafb50055f Add character-sets-dir argument to "mysql". That avoids a local
installed charset dir being used.
2006-09-18 17:46:36 +02:00
msvensson@shellback.(none)
45a8c28498 Fix spelling error in Makefile 2006-09-18 13:24:03 +02:00
msvensson@shellback.(none)
16c07bd02c No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
2006-09-18 12:45:04 +02:00
msvensson@shellback.(none)
60b395a950 Remove extra semicolon 2006-09-18 12:24:10 +02:00
msvensson@shellback.(none)
914efcdfe2 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 12:12:57 +02:00
msvensson@shellback.(none)
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 11:34:07 +02:00
msvensson@shellback.(none)
0a59967cb0 Remove trailing whitespace
Add linebreak
2006-09-18 11:27:21 +02:00
msvensson@shellback.(none)
dd76996955 Move mysql-test-run.sh to new name mysql-test-run-shell.sh
Symlink mysql-test-run to mysql-test-run.pl
2006-09-18 11:22:51 +02:00
ramil/ram@myoffice.izhnet.ru
d4804e07e4 Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
2006-09-18 10:43:06 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ad1c1592e1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b18267
2006-09-18 10:37:26 +05:00
msvensson@shellback.(none)
dedcdda5df BUG#22396 crash_commit_before
- Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.
2006-09-17 20:54:06 +02:00
baker@bk-internal.mysql.com
343e08391d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-09-16 07:19:42 +02:00
cmiller@zippy.cornsilk.net
dc8449886f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-15 18:19:09 -04:00
cmiller@zippy.cornsilk.net
66808ead4e Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-15 18:18:18 -04:00
brian@zim.(none)
f79ddec1f2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/merge-5.1
2006-09-15 10:48:30 -07:00
brian@zim.(none)
7194b6d75a This changes the order of the universe, black is now the new white.
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
2006-09-15 10:28:00 -07:00
msvensson@shellback.(none)
a29f9c3b2e Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-15 18:08:03 +02:00
msvensson@shellback.(none)
c6df1a5cd9 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-15 18:01:52 +02:00
msvensson@shellback.(none)
6521f20bc1 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-15 18:00:26 +02:00
msvensson@shellback.(none)
d8e27606e1 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 18:00:03 +02:00
msvensson@shellback.(none)
61bffe0c6b Removing disabling of func_group 2006-09-15 17:59:16 +02:00
msvensson@shellback.(none)
3abb1684f7 Remove disabling of func_in 2006-09-15 17:57:56 +02:00