mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47678 commits 2784 branches 343 tags 1.6 GiB
Commit graph

567 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
027456393e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:38:37 +02:00
tomas@whalegate.ndb.mysql.com
b36a87ae91 corrected typo 2007-06-19 11:38:07 +02:00
tomas@whalegate.ndb.mysql.com
04f1913789 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:26:23 +02:00
tomas@whalegate.ndb.mysql.com
a67e755593 turn off binlogging of the updates during wait for not_readonly 2007-06-19 11:25:19 +02:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-18 23:55:48 +02:00
tomas@whalegate.ndb.mysql.com
55c6e7b142 check for different error message 2007-06-18 17:57:16 +02:00
tomas@whalegate.ndb.mysql.com
1c15d3e1a1 fixes Bug #25305 (and several other similar test tailures with the same symptom) 
- make tests wait until ndb connects properly
 2007-06-18 15:36:10 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 09:42:22 +02:00
tsmith@quadxeon.mysql.com
918090030b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
 2007-06-15 01:57:33 +02:00
holyfoot/hf@hfmain.(none)
1e9373fd60 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:42:43 +05:00
gkodinov/kgeorge@magare.gmz
56290f2690 Bug #28991: rpl_events failure in pushbuild 
In tests waiting on a timeout is not deterministic enough
to make sure that an event actually finished executing.
Fixed the test by waiting in a loop and checking the effect
that the event is supposed to produce.
 2007-06-14 12:53:13 +03:00
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
holyfoot/hf@hfmain.(none)
79f0900f9a Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28757/my51-28757
 2007-06-12 18:33:49 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
7093310760 Bug #28757 Test program / embedded server crash in test "unsafe_binlog_innodb" 
the reported test failure is fixed by the patch to 28333,
but there's a bit more to fix in the test itself - to
drop tables created in this test at the test's beginning.
 2007-06-12 17:53:16 +05:00
mats@kindahl-laptop.dnsalias.net
9278400179 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-11 22:18:10 +02:00
mats@kindahl-laptop.dnsalias.net
7bc43ebfc9 BUG#24954 (Last_errno and Last_error not set after master_retry_count has 
been reached):

Post-merge patch to handle all the changes to the tree since the tree
was cloned.
 2007-06-11 22:15:39 +02:00
evgen@moonbone.local
a52c981d6a Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-06-11 00:16:00 +04:00
gluh@mysql.com/eagle.(none)
70e7487db3 compilation error fix 2007-06-09 16:05:43 +05:00
mats@kindahl-laptop.dnsalias.net
a4c6ff8551 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-09 08:29:51 +02:00
mats@kindahl-laptop.dnsalias.net
9094e97aed BUG#24954 (Last_errno and Last_error not set after master_retry_count was reached): 
Adding new fields Last_{IO,SQL}_Errno and Last_{IO,SQL}_Error to output
of SHOW SLAVE STATUS to hold errors from I/O and SQL thread respectively.
Old fields Last_Error and Last_Errno are aliases for Last_SQL_Error and
Last_SQL_Errno respectively.

Fields are added last to output of SHOW SLAVE STATUS to allow old applications
to use the same positional arguments into the row, while allowing new
application to benefit from the added information.

In addition, some new error codes are added (especially for the I/O
thread) to be able to provide sensible error message.
 2007-06-09 07:19:37 +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
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)
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)
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
joerg@trift2.
449cd28598 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-06 19:59:18 +02: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
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
joerg@trift2.
d822cf03e5 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-04 11:24:49 +02: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
df@pippilotta.erinye.com
dd9afd5d98 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-05-30 17:11:08 +02:00
mleich@four.local.lan
1ce2e5c712 This changeset belongs to the fix of Bug#735 Prepared Statements: there is no support for Query Cache 
- Create "--ps-protocol" and no "--<whatever>-protocol" variants of the former tests
  t/grant_cache.test and t/query_cache_sql_prepare.test.
- Some additional subtest and fixes of bugs
- Minor improvements
 2007-05-24 22:13:49 +02:00
kostja@vajra.(none)
0162745cff Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
 2007-05-24 19:34:14 +04:00
tomas@whalegate.ndb.mysql.com
ffe2982b99 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-21 09:01:06 +02:00
dlenev@mockturtle.local
b0dfdc2b83 Patch changing how ALTER TABLE implementation handles table locking 
and invalidation in the most general case (non-temporary table and
not simple RENAME or ENABLE/DISABLE KEYS or partitioning command).

See comment for sql/sql_table.cc for more information.

These changes are prerequisite for 5.1 version of fix for bug #23667
"CREATE TABLE LIKE is not isolated from alteration by other connections"
 2007-05-19 10:49:56 +04:00
holyfoot/hf@hfmain.(none)
783c7071bf Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-18 20:04:01 +05:00
holyfoot/hf@hfmain.(none)
85d5dfedf6 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-05-18 20:00:49 +05:00
kostja@vajra.(none)
0a061c902b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
 2007-05-15 17:54:11 +04:00
df@pippilotta.erinye.com
7c7ab07719 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
 2007-05-15 11:33:19 +02:00