Commit graph

8221 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
3c0ed6d410 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 19:55:50 +01:00
aivanov@mysql.com
e22d2f1150 Fixed BUG#9680: Wrong error from cascading update
Applied 9680.patch (by Osku Salerma)
2006-02-09 20:43:10 +03:00
jmiller@mysql.com
a66d8a5b3b test updates 2006-02-09 15:29:57 +01:00
ramil@mysql.com
e1dabf65e4 Merge mysql.com:/usr/home/ram/work/4.1.heap
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-02-09 18:23:37 +04:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
2006-02-09 16:23:09 +02:00
aelkin@mysql.com
7b6afbd534 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-09 15:20:39 +02:00
konstantin@mysql.com
2a267fed2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 14:22:34 +03:00
jmiller@mysql.com
3c426cd787 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-09 12:15:42 +01:00
konstantin@mysql.com
e1f807af26 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00
lars@mysql.com
84197bd43c Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-09 09:27:41 +01:00
bell@sanja.is.com.ua
daaf883f97 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-09 10:26:06 +02:00
brian@zim.tangent.org
01a8c54406 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-08 21:55:40 -08:00
tomas@poseidon.ndb.mysql.com
d39cb0eb0c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 06:45:28 +01:00
konstantin@mysql.com
51fda104cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 01:06:55 +03:00
jmiller@mysql.com
74d8c2b838 rpl_ndb_sync.result, rpl_ndb_sync.test:
Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you were right
2006-02-08 23:06:01 +01:00
konstantin@mysql.com
19018128a3 Merge mysql.com:/home/kostja/mysql/tmp_merge1
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 00:21:22 +03:00
jmiller@mysql.com
4a7cd1a583 rpl_stm_log.test:
Fixed bug in test case
2006-02-08 22:17:46 +01:00
tomas@poseidon.ndb.mysql.com
c4c4510a54 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-08 22:15:34 +01:00
jmiller@mysql.com
33781f642e Missed a check in of new results for rpl_relay_space_myisam 2006-02-08 22:00:11 +01:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 23:53:45 +03:00
tomas@poseidon.ndb.mysql.com
edd1417b46 Bug #17206 Update through VIEW is not working 2006-02-08 18:08:18 +01:00
jmiller@mysql.com
0a59884aad Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 17:48:22 +01:00
jmiller@mysql.com
8e8235ff7c implement a reviw comments 2006-02-08 17:09:57 +01:00
jmiller@mysql.com
e3bfdb9b1c Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 16:52:34 +01:00
jmiller@mysql.com
dacf64b678 Implement suggestions from lars review 2006-02-08 16:47:46 +01:00
tomas@poseidon.ndb.mysql.com
8d1e578cef Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-08 14:08:45 +01:00
tomas@poseidon.ndb.mysql.com
6295103f96 Bug#17233, disabled test in waiting for bug fix 2006-02-08 14:07:52 +01:00
jmiller@mysql.com
75b6720509 More updates for using NDB as default and some bug fixes along the way 2006-02-08 13:08:19 +01:00
ramil@mysql.com
34abab41db Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed'). 2006-02-08 16:00:39 +04:00
konstantin@mysql.com
365404a048 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 14:05:19 +03:00
andrey@lmy004.
9951b9db96 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-08 11:54:37 +01:00
lars@mysql.com
6bbb1de9ca Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-08 11:40:13 +01:00
konstantin@mysql.com
d4c5516929 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:11:44 +03:00
lars@mysql.com
66bc803160 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-08 10:37:47 +01:00
bell@sanja.is.com.ua
ded01c3b6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-08 10:36:42 +02:00
brian@zim.tangent.org
23d99ee03c The handlerton structures for archive and CSV had not been updated. Nicht so gute. I also fixed CSV to use fast alter table and put in a test in archive in case someone tries to do the same there (hint... it won't work). 2006-02-07 22:42:57 -08:00
petr@mysql.com
7aa7e4b437 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
2006-02-08 09:15:41 +03:00
andrey@lmy004.
4b0f608472 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-07 23:40:03 +01:00
konstantin@mysql.com
da377d1ec8 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:33:31 +03:00
pekka@mysql.com
14249f23ed Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-02-07 21:52:56 +01:00
bell@sanja.is.com.ua
6916a4bfe6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-07 22:10:44 +02:00
msvensson@neptunus.(none)
b59c67861f Merge neptunus.(none):/home/msvensson/mysql/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 20:54:41 +01:00
gunnar@mysql.com.
f6590a3b89 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com.:/data/BK/mysql-5.0
2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-02-07 20:04:54 +01:00
msvensson@neptunus.(none)
4ddcc7ccc2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 20:02:08 +01:00
msvensson@neptunus.(none)
ba6b1a6e9b Removed extra "drop view v1" 2006-02-07 19:59:19 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
andrey@lmy004.
64c34f101f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-07 19:37:26 +01:00
andrey@lmy004.
4ba2a3322b - fix for bug #16414 (Events: Crash or hang if event drops itself)
WL#1034 (Internal CRON)
(with post-review fix)
2006-02-07 19:28:33 +01:00
jmiller@mysql.com
e5a7238aed Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-07 19:19:42 +01:00