Commit graph

53168 commits

Author SHA1 Message Date
joerg@trift2.
480a15dc44 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 16:58:37 +01:00
joerg@trift2.
89d5b47c6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  trift2.:/MySQL/M50/push-5.0
2008-02-13 16:55:22 +01:00
df@pippilotta.erinye.com
c78d616938 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2008-02-13 14:44:56 +01:00
joerg@trift2.
9337cfbb39 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:49:49 +01:00
joerg@trift2.
51f81b0209 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:40:53 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
22072c5c57 Bug #33931 assertion at write_ignored_events_info_to_relay_log if init_slave_thread() fails
and
bug#33932  assertion at handle_slave_sql if init_slave_thread() fails

the asserts were caused by 
  bug33931: having thd deleted at time of executing err: code plus
            a missed initialization;
  bug33932: initialization of slave_is_running member was missed;

fixed with relocating mi members initialization and removing delete thd
It is safe to do as deletion happens later explicitly in the caller of
init_slave_thread().

Todo: at merging the test is better to be moved into suite/bugs for 5.x (when x>0).
2008-02-13 14:09:41 +02:00
joerg@trift2.
341258dba4 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +01:00
joerg@trift2.
d500b8650d Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-02-13 12:58:10 +01:00
joerg@trift2.
e31275c481 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-02-13 12:48:25 +01:00
mkindahl@dl145h.mysql.com
32853b9fa5 Removing non-deterministic tests from events_scheduling test. 2008-02-13 12:41:54 +01:00
tomas@poseidon.ndb.mysql.com
f9a38a9e4e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 12:36:57 +01:00
mkindahl@dl145h.mysql.com
b1fadc4cf9 The test rpl_row_charset and it dependent rpl_ndb_charset is
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.

This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
2008-02-13 11:37:06 +01:00
anozdrin/alik@quad.
7e88f7718c Additional patch for Bug#31222: com_% global status counters
behave randomly with mysql_change_user.

The test case had to be moved into not_embedded_server.test file,
because SHOW GLOBAL STATUS does not work properly in embedded
server (see bug 34517).
2008-02-13 13:00:24 +03:00
anozdrin/alik@quad.
265dbd3056 Additional patch for Bug#32538. Fix result files of windows test cases. 2008-02-13 12:02:16 +03:00
tomas@poseidon.bredbandsbolaget.se
cc6c696330 Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 08:07:24 +01:00
anozdrin/alik@quad.
d36d243d3d Fix for Bug#32538: View definition picks up character set,
but not collation.

The problem here was that text literals in a view were always
dumped with character set introducer. That lead to loosing
collation information.

The fix is to dump character set introducer only if it was
in the original query. That is now possible because there 
is no problem any more of loss of character set of string
literals in views -- after WL#4052 the view is dumped 
in the original character set.
2008-02-12 22:09:16 +03:00
anozdrin/alik@quad.
931f793c5c Additional fix for Bug#31222. 2008-02-12 21:42:15 +03:00
kent@mysql.com/kent-amd64.(none)
a5edb90edf ha_ndbcluster.m4:
If the third number in version is followed by a letter, include it
  in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD
2008-02-12 19:08:04 +01:00
anozdrin/alik@quad.
d665fc3bd7 Fix for Bug#31222: com_% global status counters
behave randomly with mysql_change_user.
  
The problem was that global status variables were not updated
in THD::check_user(), so thread statistics were lost after
COM_CHANGE_USER.
  
The fix is to update global status variables with the thread ones
before preparing the thread for new user.
2008-02-12 20:59:09 +03:00
mkindahl@dl145h.mysql.com
a3fe485dfe Various fixes to fix memory leaks after merging replication
tree with main.
2008-02-12 18:21:17 +01:00
sven@riska.(none)
5fb3cc65c3 Moved mysql-test/suite/rpl/rpl_variables.test into
mysql-test/t/variables.test, because:
 - mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything,
so should not be in the rpl suite.
 - mysql-test/t/variables.test is the place for testing variable-related
problems and features.
 - I will soon commit a patch containing a test case that tests
replication of variables. It would be good if I could call the test case
mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now.
2008-02-12 17:22:04 +01:00
tomas@poseidon.ndb.mysql.com
5cdbd24da0 corrected really strange test 2008-02-12 14:50:36 +01:00
davi@mysql.com/endora.local
48ac77a95a Bug#23771 AFTER UPDATE trigger not invoked when there are no changes of the data
The problem is that AFTER UPDATE triggers will fire only if the
new data is different from the old data on the row. The trigger
should fire regardless of whether there are changes to the data.

The solution is to fire the trigger on UPDATE even if there are
no changes to the value (because the value is the same).
2008-02-12 09:44:27 -02:00
aelkin/andrei@mysql1000.dsl.inet.fi
139e6acd2d Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug34427-rpl_vars_warn_slave_err
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback
2008-02-12 12:47:04 +02:00
aelkin/andrei@mysql1000.dsl.inet.fi
0eba2cf0bf Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug32790-assert_mdel_norm_tables
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback
2008-02-12 12:38:55 +02:00
tomas@poseidon.ndb.mysql.com
f042355aea Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-12 11:25:06 +01:00
tomas@poseidon.ndb.mysql.com
a4d8864b5e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-rpl-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-12 11:22:07 +01:00
tomas@poseidon.ndb.mysql.com
3a142141ec Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-12 11:21:05 +01:00
mkindahl@dl145h.mysql.com
e91c287ead Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 18:16:56 +01:00
mkindahl@dl145h.mysql.com
83dac31180 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 18:10:56 +01:00
mkindahl@dl145h.mysql.com
23d670c33e Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-02-11 18:09:17 +01:00
df@pippilotta.erinye.com
72073063cb Make this build on Windows. 2008-02-11 18:02:37 +01:00
mkindahl@dl145h.mysql.com
3afb341aaf Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-02-11 17:57:02 +01:00
tomas@poseidon.ndb.mysql.com
bb93040854 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-11 17:39:58 +01:00
tomas@poseidon.ndb.mysql.com
832b498e72 Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-11 17:38:34 +01:00
tomas@poseidon.ndb.mysql.com
3103c2fb8c Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-11 17:37:25 +01:00
tomas@poseidon.ndb.mysql.com
fe364e4c2d default changed not to run idempotent, but test requires it because of how ndb logs updates as write 2008-02-11 15:26:38 +01:00
sven@riska.(none)
61f941204a Problem: pushbuild has sporadic errors during startup of
rpl_ndb_rep_ignore
Reason: previous test, rpl_ndb_2multi_eng, does not sync slave with master
after cleanup, so tables are sometimes left on slave
Fix: sync_slave_with_master
2008-02-11 15:14:24 +01:00
tomas@poseidon.ndb.mysql.com
93e218990f correcting wrong test case 2008-02-11 15:06:07 +01:00
bar@mysql.com/bar.myoffice.izhnet.ru
efa7ee3573 Bug#27877 incorrect german order in utf8_general_ci
Problem: incorrect sort order for "U+00DF SHARP S".
Fix: changing sort order for U+00DF to be equal to 's',
like the manual says.
2008-02-11 16:28:33 +04:00
anozdrin/alik@quad.
301ab0d8b7 Disable sporadically failing test cases (Bug#34454). 2008-02-11 14:34:53 +03:00
anozdrin/alik@quad.
524cbe2e4c Disabling declaration of debug variable for non-debug builds.
(originally from Mats)
2008-02-11 14:05:27 +03:00
anozdrin/alik@quad.
a52a30e3e6 Patch to eliminate some valgrind warnings in debug printout code.
(originally from Mats)
2008-02-11 14:04:30 +03:00
aelkin/andrei@mysql1000.dsl.inet.fi
0cd061e98f Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug33329-extra_rollback_when_innodb_in
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/mysql-5.0-rpl-bug33329-extra_rollback
2008-02-11 11:26:02 +02:00
mkindahl@dl145h.mysql.com
ccd09676db Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 10:06:21 +01:00
mkindahl@dl145h.mysql.com
525a324a77 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-02-11 09:42:28 +01:00
jonas@perch.ndb.mysql.com
1eefb8c3cb Fix missing block-constructor 2008-02-10 17:50:53 +01:00
sven@riska.(none)
41bb462652 Problem: pushbuild fails in embedded mode on test binlog_base64_flag
because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.
2008-02-09 19:43:32 +01:00
kostja@dipika.(none)
b09af4bef4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-09 14:42:26 +03:00
kostja@dipika.(none)
84713274ba Fix a buffer overflow with strmake(). 2008-02-09 10:31:22 +03:00