Commit graph

14399 commits

Author SHA1 Message Date
guilhem@mysql.com
93101561fd Fix for BUG#4500 "set character set replicates incorrectly"
We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.
2004-08-29 14:13:51 +02:00
paul@ice.snake.net
34dc3a86df Minor edits to error messsage. 2004-08-28 13:07:47 -05:00
lenz@mysql.com
0f023b3b9b - fixed typo so make dist does not fail 2004-08-28 09:31:15 +02:00
monty@mysql.com
f574cd4e8f Code style fixes.
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
2004-08-28 00:49:54 +03:00
lenz@mysql.com
51fe3e78e3 - adding more missing libedit files 2004-08-27 22:52:33 +02:00
lenz@mysql.com
cb161dedc3 - add missing file "read.h" to the source distribution 2004-08-27 21:18:51 +02:00
joreland@mysql.com
b06298a39b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 19:35:24 +02:00
paul@kite-hub.kitebird.com
f1c0b1be9e mysql.cc:
Minor edits to help command messages.
2004-08-27 12:27:57 -05:00
joreland@mysql.com
cca01b0191 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 19:02:46 +02:00
bar@mysql.com
4d1dedd70d Compile all charset conversion tables if --with-extra-charsets=all
or --with-extra-charsets=complex is given.
2004-08-27 21:17:29 +05:00
bar@mysql.com
521643c85a Bu#4526 building with utf8_bin collation causes help to be case sensitive 2004-08-27 21:12:53 +05:00
bar@mysql.com
b604164599 Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict 2004-08-27 20:48:19 +05:00
bar@mysql.com
e8fcc297e1 grant.result:
Forgot to push in the previous changeset
2004-08-27 20:48:18 +05:00
pekka@mysql.com
9cb779b2a5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-08-27 17:48:17 +02:00
vva@eagle.mysql.r18.ru
d5cb5c57d9 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-08-27 20:48:16 +05:00
vva@eagle.mysql.r18.ru
1dee12bba4 fixed format of history of new libedit for compatibility
with old libedit and readline

1. discarded reading and writting of hist_cookie as the begin of the file
2. skip strvis for string before saving
2004-08-27 20:32:28 +05:00
pekka@mysql.com
ea595ff5b9 bug-5252 fix (tinyblob) 2004-08-27 15:10:53 +02:00
joreland@mysql.com
f33207ac8d Fix order by 2004-08-27 14:15:47 +02:00
joreland@mysql.com
e85ce08901 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 14:02:02 +02:00
ram@gw.mysql.r18.ru
3acccb988a A fix (Bug : CREATE TABLE ... SELECT can deadlock itself). 2004-08-27 16:43:01 +05:00
bar@mysql.com
10b88b37b7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-27 15:56:27 +05:00
bar@mysql.com
b10dcf7aa6 grant.result:
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
2004-08-27 15:55:16 +05:00
bar@mysql.com
5258ea12cf table.cc:
Bug  Escape handling error for ENUM values in SJIS encoding
2004-08-27 12:09:28 +05:00
joreland@mysql.com
b2f60188df Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 08:54:34 +02:00
bar@mysql.com
43b792d5cf win1251.conf:
Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110
2004-08-27 10:54:57 +05:00
sergefp@mysql.com
9366988718 Adding the file needed for windows build (on behalf of Reggie) 2004-08-27 03:27:16 +04:00
rburnett@build.mysql.com
bd48150e38 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-27 01:14:12 +02:00
rburnett@build.mysql.com
caf1e73be7 Adding a file that was missed during the first push
This file was part of the patch for 
Bug   	Nothing in .err when mysql service ends because of malformed my.ini options 

message.mc:
  new file
2004-08-27 01:08:57 +02:00
joreland@mysql.com
6df66180bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 01:01:47 +02:00
joreland@mysql.com
95e5b457b8 Fix ordered index scan with partially specified key 2004-08-27 00:59:16 +02:00
mwagner@here.mwagner.org
0cde6e4dcb Do-compile:
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
2004-08-26 16:44:01 -05:00
konstantin@mysql.com
762771d8dc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5126
2004-08-26 22:48:05 +04:00
konstantin@mysql.com
46f1922fb5 A short fix and test case for Bug#5126
"Mediumint and PS problem": just treat mediumint as long.
2004-08-26 22:47:34 +04:00
joerg@mysql.com
36d93f402c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-08-26 20:43:58 +02:00
lenz@mysql.com
2ed54c12e5 - fixed brain fart in Bootrap - it never actually caught failures
when pulling BK trees before.
2004-08-26 19:57:32 +02:00
lenz@mysql.com
e876d6f4da - typo fix - make sure to include an existing file in the source
distribution...
2004-08-26 19:46:11 +02:00
serg@serg.mylan
08f3ba0e29 after merge 2004-08-26 18:22:22 +02:00
serg@serg.mylan
5633414c8f Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:51:21 +02:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:49:16 +02:00
serg@serg.mylan
0712f34d72 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-26 17:49:04 +02:00
joerg@mysql.com
10cf7f1f38 If the system has 64 bit "long", then "long long" does not add new
functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.
2004-08-26 17:30:53 +02:00
monty@mysql.com
ceba1429b7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-08-26 18:27:33 +03:00
monty@mysql.com
ea687ba5da Portability fixes
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
miguel@hegel.txg.br
2c18195e73 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.txg.br:/home/miguel/bk/mysql-4.0
2004-08-26 11:44:02 -03:00
serg@serg.mylan
88e76d4a6e Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 15:33:52 +02:00
serg@serg.mylan
a9e98dd7c6 remove warning 2004-08-26 15:32:57 +02:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
jani@rhols221.adsl.netsonic.fi
5e4df770e3 Fixed a bug in mysql.cc. Overriding password prompting
by giving password as an argument later did not work.
2004-08-26 16:15:36 +03:00
ram@gw.mysql.r18.ru
9bc14a9605 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 17:52:07 +05:00
ram@gw.mysql.r18.ru
49868b9fd4 Should check for GEOM_FLAG later because keyX may be partly initialized (min_flag is not set). 2004-08-26 17:43:08 +05:00