mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49679 commits 2781 branches 343 tags 1.6 GiB
Commit graph

19504 commits

Author SHA1 Message Date
mats@kindahl-laptop.dnsalias.net
f2ba11c327 BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER 
is possible):

When skipping the beginning of a transaction starting with BEGIN, the OPTION_BEGIN
flag was not set correctly, which caused the slave to not recognize that it was
inside a group. This patch sets the OPTION_BEGIN flag for BEGIN, COMMIT, ROLLBACK,
and XID events. It also adds checks if inside a group before decreasing the
slave skip counter to zero.

Begin_query_log_event was not marked that it could not end a group, which is now
corrected.
 2007-10-19 14:18:41 +02:00
mats@kindahl-laptop.dnsalias.net
cd88c4dc8a Fixing bug in test in that a database was not dropped and was visible 
in following tests.
 2007-09-21 08:13:52 +02:00
mats@kindahl-laptop.dnsalias.net
8b5248a52b Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
 2007-09-20 18:30:00 +02:00
mats@kindahl-laptop.dnsalias.net
c5622b424f BUG#31076 (Server crashes when start slave is issued): 
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
 2007-09-20 16:31:05 +02:00
lars/lthalmann@dl145h.mysql.com
0ad6384f9e Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
 2007-09-17 14:14:02 +02:00
lars/lthalmann@dl145h.mysql.com
234e55623b Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-09-17 12:38:22 +02:00
aelkin@dl145j.mysql.com
0c153419ce Merge: bug@27417,23333 and bug#28960 tests with 5.1 2007-09-17 12:31:10 +02:00
aelkin@dl145j.mysql.com
11c9a13a24 Merge: bug#27417,23333 manual work for fixing tests and a source code. 2007-09-16 18:16:40 +02:00
aelkin@dl145j.mysql.com
e9b287f27e Manual merge fixes/tests for bugs_28960,27417,23333. 2007-09-16 12:07:00 +02:00
aelkin@dl145j.mysql.com
1a0fea60a3 Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl 
into  dl145j.mysql.com:/tmp/andrei/5.1-merge
 2007-09-15 21:25:56 +02:00
lars/lthalmann@dl145h.mysql.com
7d6f639d28 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-09-10 13:59:38 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
4bfad3e923 replaced '--exec rm' to '--remove_file' 2007-09-07 12:04:57 +04:00
malff@omega.weblab
1a13d76941 Test cleanup in rpl_binlog_grant: XID values are unpredictable 2007-09-06 12:06:22 -06:00
davi@moksha.local
0187e78f40 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
 2007-09-06 13:28:00 -03:00
davi@moksha.local
4aaab47ea9 The test case for bug 28587 doesn't work with the embedded version, 
the first query is not running while we are doing wait queries on
a second connection.
 2007-09-06 13:22:34 -03:00
dlenev@mockturtle.local
175c1ab740 Make events.test more robust against timing issues. 2007-09-06 15:57:36 +04:00
malff@omega.weblab
0a10782f75 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  omega.weblab:/home/malff/TREE/mysql-5.1-cleanup
 2007-09-05 12:15:24 -06:00
malff@omega.weblab
43e5ab75ca Test events_logs_tests cleanup 
Fixed test failure under heavy load, in case truncate table is slow.
 2007-09-05 12:14:43 -06:00
davi@moksha.local
2e3ded3ec9 The test case for Bug#29936 doesn't work with the embedded version, 
the first query is not running while we are doing wait queries on
a second connection.
 2007-09-05 15:03:02 -03:00
malff/marcsql@weblab.(none)
0f58ed7e74 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 12:25:54 -06:00
rafal@quant.(none)
1835b16255 Disabling rpl_ndb_2other test. 2007-09-04 15:24:04 +02:00
anozdrin/alik@station.
c39d032da2 Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS 
statement.
 2007-09-03 15:13:34 +04:00
msvensson@pilot.(none)
122f5f6cd0 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-09-01 11:43:44 +02:00
msvensson@pilot.(none)
66ae874371 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-09-01 11:42:43 +02:00
msvensson@pilot.(none)
0ccf3502ef Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-09-01 11:41:59 +02:00
msvensson@pilot.(none)
c5ea7b0641 Use eval around "rmtree" and use our own version of rmtree if it fails 2007-09-01 11:41:38 +02:00
malff/marcsql@weblab.(none)
143d8e460e Fixed timing issues in events.test 2007-08-31 15:51:57 -06:00
anozdrin/alik@ibm.opbmk
0261d2d9db Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  ibm.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-bug25843
 2007-08-31 22:13:27 +04:00
tsmith@ramayana.hindu.god
b5c13a0f46 Correct fix for test result. 2007-08-31 10:53:51 -06:00
anozdrin/alik@ibm.opbmk
d6f94b062c Fix for BUG#25843: changing default database between PREPARE and EXECUTE 
of statement breaks binlog.

There were two problems discovered by this bug:

  1. Default (current) database is not fixed at the creation time.
     That leads to wrong output of DATABASE() function.

  2. Database attributes (@@collation_database) are not fixed at
     the creation time. That leads to wrong resultset.

Binlog breakage and Query Cache wrong output happened because of
the first problem.

The fix is to remember the current database at the PREPARE-time and
set it each time at EXECUTE.
 2007-08-31 20:42:14 +04:00
malff/marcsql@weblab.(none)
e5ac5a0881 Test cleanup for events.test 2007-08-31 08:49:49 -06:00
tsmith@ramayana.hindu.god
d70e4b0c92 Correct test result file for bug #27014 2007-08-31 05:21:12 -06:00
tsmith@ramayana.hindu.god
47dc161f5b Fix test results for bug #27014 2007-08-31 01:28:42 -06:00
malff/marcsql@weblab.(none)
4cab11097e Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-08-30 17:05:49 -06:00
tsmith@ramayana.hindu.god
cefe7a3c8b Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:56:24 -06:00
tsmith@ramayana.hindu.god
ebe3894004 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:54:19 -06:00
tsmith@ramayana.hindu.god
58ecaaa859 Disable rpl_ndb_2other, which has never worked on bigendian machines. 2007-08-30 14:13:05 -06:00
malff/marcsql@weblab.(none)
2482c59740 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-08-30 13:23:59 -06:00
davi@moksha.local
37d48bfe30 Post-merge test case with wait_condition for Bug#28587 2007-08-30 16:19:23 -03:00
malff/marcsql@weblab.(none)
4792ed4220 Bug#28779 (mysql_query() allows execution of statements with unbalanced 
comments)

This change set is for 5.1 (manually merged)

Before this fix, the server would accept queries that contained comments,
even when the comments were not properly closed with a '*' '/' marker.

For example,
  select 1 /* + 2 <EOF>
would be accepted as
  select 1 /* + 2 */ <EOF>
and executed as
  select 1

With this fix, the server now rejects queries with unclosed comments
as syntax errors.
Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
closed with '*' '/' to be parsed correctly.
 2007-08-30 12:57:05 -06:00
kaa@polly.(none)
4c2a63ea54 Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164 
into  polly.(none):/home/kaa/src/bug30164/my51-bug30164
 2007-08-30 17:23:39 +04:00
kaa@polly.(none)
33d10a0667 Use double quotes instead of single ones which make the test fail on Windows. This is for bug #30164. 2007-08-30 17:21:43 +04:00
kaa@polly.(none)
e79902aa5c Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164 
into  polly.(none):/home/kaa/src/bug30164/my51-bug30164
 2007-08-30 12:55:29 +04:00
kaa@polly.(none)
2bb849644b Bug #30164: Using client side macro inside server side comments generates broken queries 
Problem:
  
In cases when a client-side macro appears inside a server-side comment, the add_line() function in mysql.cc discarded all characters until the next delimiter to remove macro arguments from the query string. This resulted in broken queries being sent to the server when the next delimiter character appeared past the comment's boundaries, because the comment closing sequence ('*/') was discarded.
  
Fix:
  
If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro (that is, until the end of the comment rather than the next delimiter).
This is a minimal fix to allow only simple cases used by the mysqlbinlog utility. Limitations that are worth documenting:
  
- Nested server-side and/or client-side comments are not supported by mysql.cc
- Using client-side macros in multi-line server-side comments is not supported
- All characters after a client-side macro in a server-side comment will be omitted from the query string (and thus, will not be sent to server).
 2007-08-30 12:53:24 +04:00
msvensson@pilot.(none)
45667e6429 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-30 07:25:18 +02:00
malff/marcsql@weblab.(none)
496eb569d9 Manual merge 2007-08-29 17:27:38 -06:00
tsmith@sita.local
653f7341bb Post-merge fixes, and disable buggy test case on embedded 2007-08-29 16:58:00 -06:00
davi@moksha.local
a2a5104de7 Post-merge fixes for Bug#30632 2007-08-29 19:00:49 -03:00
brian@piggy.tangent.org
52ae4496c5 Added ORDER BY to udf select so that results are ordered. 2007-08-29 14:36:08 -07:00
davi@moksha.local
68047f7f88 Merge moksha.local:/Users/davi/mysql/push/bugs/old/30632-5.0 
into  moksha.local:/Users/davi/mysql/push/bugs/30632-5.1
 2007-08-29 18:32:19 -03:00