acurtis@pcgem.rdg.cyberkinetica.com
b823638f38
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug6726
2005-02-03 23:14:47 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
d794406f64
Bug#6726 - failure to parse NOT BETWEEN
...
Fix and test for parse bug
2005-02-03 23:08:43 +00:00
guilhem@mysql.com
a85df46c01
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 18:55:29 +01:00
guilhem@mysql.com
ac053d80e9
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 16:25:57 +01:00
guilhem@mysql.com
ed1696f6b9
WL#1062 "log charset info into all Query_log_event":
...
we store 7 bytes (1 + 2*3) in every Query_log_event.
In the future if users want binlog optimized for small size and less safe,
we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
is something by design optional (even if for now we don't offer possibility to disable it):
it's not a binlog format change.
We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
by caching the charset read from the previous event (which will often be equal to the one of the current event).
We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
No more errors if one changes the global value of charset vars on master or slave
(as we log charset info in all Query_log_event).
Not fixing Load_log_event as it will be rewritten soon by Dmitri.
Testing how mysqlbinlog behaves in rpl_charset.test.
mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
the correct value for this option to mysqlbinlog.
Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
Roughly the same job is to be done for timezones :)
2005-02-03 16:22:16 +01:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
monty@mysql.com
e791e86444
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-02 20:30:57 +02:00
jimw@mysql.com
bcac063558
Fix merge of func_str tests (accidently duplicated a test).
2005-02-02 09:05:52 -08:00
jimw@mysql.com
5f0c4ff140
Merge fixes for #8248 , #5569 .
2005-02-02 08:21:11 -08:00
monty@mysql.com
b131520f9d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-02 16:50:35 +02:00
igor@rurik.mysql.com
0fb0dab4ca
func_str.result, func_str.test:
...
Added a test case for bug #7751 .
item_strfunc.cc:
Fixed bug #7751 .
The function Item_func_conv::val_str did not update
the unsigned_flag value.
2005-02-01 23:34:31 -08:00
sergefp@mysql.com
9eca8dced6
Adjust test results for BUG#7634: The result of EXPLAIN is different if OS doesn't support file sizes > 2G
2005-02-02 07:51:43 +03:00
jimw@mysql.com
e86457cef0
Fix QUOTE() to not reuse the input field for output, which resulted in
...
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248 )
2005-02-01 18:29:10 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc
WL#1967
...
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
monty@mysql.com
b87e0c52a7
Proper fix for comparision with ' '
...
(Bug #7788 "Table is full" occurs during a multitable update")
2005-02-01 16:27:08 +02:00
bar@mysql.com
b9054c5e4a
Skip cp932 and eucjpms tests when the character sets are not compiled.
2005-02-01 14:37:51 +04:00
bell@sanja.is.com.ua
48da18cd45
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-01 11:05:29 +02:00
jimw@mysql.com
36d5d82ab5
Update client_xml test to avoid timestamp-sensitive part of test.
2005-01-31 18:48:42 -08:00
jimw@mysql.com
85a5c61c5d
Merge mysql.com:/home/jimw/my/mysql-4.1-7811
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-31 17:51:45 -08:00
jimw@mysql.com
b7dda3f7c0
Merge
2005-01-31 16:27:17 -08:00
jimw@mysql.com
61874f07df
Merge mysql.com:/home/jimw/my/mysql-4.1-8134
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:29:55 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
adb91423ac
Bug#7011
...
Merge from 4.1
2005-01-31 15:57:32 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
ba716c80f1
Bug#7011
...
Fix tests after merge from 4.0
2005-01-31 13:18:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04
Bug#7011
...
Merge from 4.0
2005-01-31 12:48:00 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f
Bug#7011
...
Fix replication for multi-update
new test - rpl_multi_update2
2005-01-30 10:24:03 +00:00
jimw@mysql.com
691cd6c50d
Fix error in string comparisons with CHAR(31) against the space-padding
...
of strings of unequal length. (Bug #8134 )
2005-01-28 17:18:35 -08:00
dlenev@mysql.com
10a9434ccd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-28 19:09:28 +03:00
dlenev@mysql.com
09b08edcc5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 17:43:59 +03:00
dlenev@mysql.com
2276bfa374
Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and
...
CONVERT_TZ() function does not work well together" and bug #7705
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
2005-01-28 10:22:50 +03:00
dlenev@mysql.com
c80c503a1b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 09:32:43 +03:00
pekka@mysql.com
8480b22122
Merge
2005-01-27 18:41:23 +01:00
pekka@mysql.com
521f736737
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-27 18:12:04 +01:00
pekka@mysql.com
5cbadf4358
ndb - make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
gluh@gluh.mysql.r18.ru
9cb334f490
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 18:23:05 +03:00
ingo@mysql.com
48488e483a
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 12:18:02 +01:00
ingo@mysql.com
896d3a5f05
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:10:15 +01:00
ram@gw.mysql.r18.ru
7fda26d7fb
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 14:16:54 +04:00
gluh@gluh.mysql.r18.ru
ac14d40dde
A fix: information_schema test fails on Mac OSX
2005-01-27 13:16:51 +03:00
ingo@mysql.com
160541b5d4
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 08:32:46 +01:00
ingo@mysql.com
c83060628d
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 08:32:38 +01:00
ingo@mysql.com
1b02e18820
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 21:09:16 +01:00
patg@patrick-galbraiths-computer.local
9103a44908
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-26 11:53:33 -08:00
dlenev@brandersnatch.localdomain
80282016c2
Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function
...
does not work well together". Now using simplier and more correct
implementation of st_lex::unlink_first_table()/link_first_table_back()
(It also nicely handles case when global table list is created because
of implictly used time zone tables). (2nd attempt)
Fix for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
column". Implemented new approach for caching objects for constant
time zone arguments. Now instead of determining whenever these arguments
are constants and performing time zone lookup at fix_fields() stage, we
do it on first get_date() invocation.
Cleanup of global @@time_zone variable handling.
2005-01-26 22:25:02 +03:00
igor@rurik.mysql.com
90fe2656c6
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-26 10:42:46 -08:00
dlenev@mysql.com
d8f0b7bec6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 18:36:18 +03:00
ingo@mysql.com
bbcd542917
Merge from 4.1
...
Archive fix by Ingo.
Innodb compile fix by Monty.
2005-01-26 15:51:46 +01:00
ingo@mysql.com
be5dade853
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 15:31:31 +01:00
ingo@mysql.com
300337cee7
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-26 15:31:06 +01:00
ingo@mysql.com
5ad151aa21
Test Bug: Memory leaks in the archive handler.
...
Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.
2005-01-26 15:27:31 +01:00
tomas@poseidon.ndb.mysql.com
259aa7131c
updated show table status usage in ndb tests to become independent on ndb cluster run
2005-01-26 15:07:39 +01:00