jmiller/ndbdev@mysql.com/ndb08.mysql.com
af62cf8072
Updated patch for Bug#28497 based off of Magnus's review
2007-06-13 05:52:43 +02:00
kaa@polly.local
120dae4c21
Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-06-12 11:48:43 +04:00
kaa@polly.local
80f839a36e
Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
...
into polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
2007-06-12 09:42:19 +04:00
kaa@polly.local
0f5a1e5910
Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
...
In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
2007-06-11 23:06:20 +04:00
msvensson@pilot.(none)
6c6268c5f9
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-08 16:21:04 +02:00
msvensson@pilot.(none)
32eff42f73
Turn off use of bin log when running with embedded server
2007-06-08 16:20:24 +02:00
msvensson@pilot.(none)
38d73beb4e
Bug#28369 rpl test cases fail with binlog disabled
...
- Backport include/show_binlog_events.inc from 5.1 and use it to make
the test output consistent results
2007-06-08 11:30:03 +02:00
msvensson@pilot.(none)
8ea2bab450
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-08 07:24:06 +02:00
msvensson@pilot.(none)
f116004a62
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-08 07:21:36 +02:00
msvensson@pilot.(none)
74ea1037fd
Use same abbrevation for statemtn in mboth mtr_cases.pl and mysql-test-run.pl
...
to crrectly filter tests to run
2007-06-08 07:19:17 +02:00
msvensson@pilot.(none)
9ed0e74db3
Bug#28369 rpl test cases fail with binlog disabled
2007-06-08 07:16:36 +02:00
jimw@rama.(none)
51a1ebe850
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2007-06-07 15:21:52 -07:00
msvensson@pilot.(none)
e5b5b8bb8f
Bug#28718 Running backup testcase fails in mysql testsuite of MySQL-enterprise-5.0.40
...
- Fix test to work on OS where backslashes are forward
2007-06-07 23:18:19 +02:00
msvensson@pilot.(none)
7340b3f108
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-07 22:24:25 +02:00
msvensson@pilot.(none)
599ec2f825
Remove "is_debug_build.inc" and use already existing "have-debug.inc"
2007-06-07 22:23:47 +02:00
msvensson@pilot.(none)
bbd7ed0287
Add "have_log_bin" requirement for fast skip when running without binlog
2007-06-07 20:35:32 +02:00
msvensson@pilot.(none)
d9b259454a
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-07 20:27:19 +02:00
msvensson@pilot.(none)
597c75d2fd
Fix typo
...
Mark one more test as needing binlog
2007-06-07 20:25:22 +02:00
msvensson@pilot.(none)
6ca8329d12
Merge pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-07 19:48:34 +02:00
msvensson@pilot.(none)
b8d8e494cd
Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 19:21:01 +02:00
msvensson@pilot.(none)
a48e321e37
Bug#28369 rpl test cases fail with binlog disabled
...
- Additional tests in 5.1 that need binlog
- Mark more test to need binlog
2007-06-07 19:20:49 +02:00
msvensson@pilot.(none)
ad2419050e
Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369
...
into pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
2007-06-07 19:19:29 +02:00
msvensson@pilot.(none)
1afb1c8ddf
Bug#28369 rpl test cases fail with binlog disabled
...
- Turn on binlog only for tests that need it
- Skip those tests if --skip-binlog is used
2007-06-07 19:18:01 +02:00
msvensson@pilot.(none)
beb08395ff
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-07 15:27:57 +02:00
msvensson@pilot.(none)
e029485449
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-07 14:33:45 +02:00
msvensson@pilot.(none)
9aa732f1ce
Merge pilot.(none):/data/msvensson/mysql/bug28718/my50-bug28718
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 14:33:13 +02:00
msvensson@pilot.(none)
91b2650735
Bug#28718 Running backup testcase fails in mysql testsuite
...
- Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
2007-06-07 14:25:17 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
2616c7b723
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b28806/b28806.5.1
2007-06-07 16:05:26 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
46f68b228e
Fix for bug #28806 : Running SHOW TABLE STATUS during high INSERT load crashes server
...
Problem: getting an autoincrement value for a partition table in the ::info() method we call
the get_auto_increment() for all partitions. That may cause a problem for at least MyISAM
tables that rely on some table state (in this particular case table->naxt_nuber_field is
set to 0 in the mysql_insert() and we get a crash).
Moreover, calling get_auto_increment() is superfluous there.
Fix: use ::info(HA_STATUS_AUTO) calls to get autoincrement values for partitions instead of
get_auto_increment() ones in the ha_partition::info().
2007-06-07 15:50:13 +05:00
kaa@polly.local
1760e138c1
Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-06-07 12:52:20 +04:00
kaa@polly.local
b51e43bbb0
Fixed tests that relied on broken behavior in acl_getroot_no_password().
...
This is to fix PB failures introduced by the patch for bug #28895 .
2007-06-07 12:45:37 +04:00
kaa@polly.local
c674243497
Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-06-07 10:26:04 +04:00
kaa@polly.local
8303cfd9e3
Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-06-06 23:47:43 +04:00
jimw@rama.(none)
3c93323d28
Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1
...
The patch for WL 1563 added a new duplicate key error message so that the
key name could be provided instead of the key number. But the error code
for the new message was used even though that did not need to change.
This could cause unnecessary problems for applications that used the old
ER_DUP_ENTRY error code to detect duplicate key errors.
2007-06-06 10:57:07 -07:00
kaa@polly.local
c48b9d6cff
Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
...
into polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
2007-06-06 21:44:05 +04:00
tsmith@quadxeon.mysql.com
13adcedc90
mtr_report.pl:
...
Add another exception to the acceptable mysqld errors, for test case for bug 28436
2007-06-06 03:49:24 +02:00
tsmith@quadxeon.mysql.com
0ca0984f59
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
2007-06-05 23:06:43 +02:00
tsmith@quadxeon.mysql.com
d2fe24d1ef
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
2007-06-05 23:04:40 +02:00
kaa@polly.local
35dd1fc535
Fix for bug #28895 "Test 'information_schema_db' fails on i5/OS 32 bit".
...
In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.
2007-06-05 22:18:07 +04:00
tsmith@quadxeon.mysql.com
4b93804592
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
2007-06-05 17:51:30 +02:00
tsmith@quadxeon.mysql.com
502320ef05
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
2007-06-05 17:28:49 +02:00
igor@olga.mysql.com
d0cb11e6ba
Post-merge fix.
2007-06-04 05:55:27 -07:00
igor@olga.mysql.com
a5011de0a8
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge
2007-06-04 03:16:17 -07:00
igor@olga.mysql.com
31c57a1efc
Post-merge fix.
2007-06-04 03:03:15 -07:00
mhansson@dl145s.mysql.com
d9fcc304d9
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
2007-06-04 09:26:54 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c67f70f13
after-merge fix.
2007-06-04 11:52:14 +05:00
igor@olga.mysql.com
ca49b83d5a
Merge olga.mysql.com:/home/igor/mysql-5.1
...
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge
2007-06-03 22:52:02 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
9be267cbf2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28652/b28652.5.0
2007-06-04 10:37:43 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a4e6061a4c
Merge mysql.com:/home/ram/work/b28652/b28652.5.0
...
into mysql.com:/home/ram/work/b28652/b28652.5.1
2007-06-04 10:14:28 +05:00
igor@olga.mysql.com
44b46b73f2
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
2007-06-03 07:58:07 -07:00