monty@mysql.com
b8ab496057
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-22 12:21:41 +03:00
rburnett@bk-internal.mysql.com
d9fb74e40e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-22 01:25:57 +02:00
mikael@dator5.(none)
9543cae6cf
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-21 19:25:56 -04:00
rburnett@bk-internal.mysql.com
8472ce9ff8
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-21 17:51:54 +02:00
mikael@dator5.(none)
eab0cfbc25
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-21 11:41:06 -04:00
rburnett@bk-internal.mysql.com
5a558eaf89
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-21 15:33:22 +02:00
lars@mysql.com
6b8c196584
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 14:14:37 +02:00
lars@dl145j.mysql.com
ed0e98529c
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-21 13:51:28 +02:00
lars@mysql.com
6839e64298
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-21 13:42:02 +02:00
monty@narttu.mysql.fi
20c00662eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-21 13:24:56 +03:00
mskold@linux.site
7704d973d4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 10:10:01 +02:00
anozdrin@mysql.com
5ce56c1cdc
Disable IM tests.
2006-06-21 11:44:54 +04:00
mskold@mysql.com
bd3f9cc0a5
Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
...
into mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 09:42:15 +02:00
mskold@mysql.com
e77850e573
Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly
2006-06-21 09:36:50 +02:00
anozdrin@mysql.com
bb94cb24c5
Re-enable IM tests.
2006-06-21 02:17:39 +04:00
mikael@dator5.(none)
da260e9e3f
Merge dator5.(none):/home/pappa/bug16000
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 16:43:25 -04:00
mikael@dator5.(none)
a3d5c3bf6d
BUG#16000: .par file left behind plus unnecessary messages to error.log
...
New test cases
2006-06-20 16:38:42 -04:00
mikael@dator5.(none)
4f599159c7
Merge dator5.(none):/home/pappa/bug19309
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 15:18:16 -04:00
mikael@dator5.(none)
39b9c16e1a
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19309
2006-06-20 15:13:44 -04:00
mikael@dator5.(none)
4dd8f90912
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 15:09:48 -04:00
rburnett@bk-internal.mysql.com
154961b26a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-20 18:06:22 +02:00
anozdrin@mysql.com
42ef881906
Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
...
into mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-20 18:28:28 +04:00
mikael@dator5.(none)
805ba2462e
Fixed test case
2006-06-20 10:16:08 -04:00
mikael@dator5.(none)
e8d39758c7
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug19281
2006-06-20 10:08:30 -04:00
rburnett@bk-internal.mysql.com
2d6fb900eb
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-20 14:51:32 +02:00
svoj@may.pils.ru
1c42c9730d
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-20 16:45:51 +05:00
monty@mysql.com
be269e56d2
SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated.
...
SHOW STATUS are not anymore put in slow query log because of no index usage.
Implemntation done by removing orig_sql_command and moving logic of SHOW STATUS to mysql_excute_command()
This simplifies code and allows us to remove some if statements all over the code.
Upgraded uc_update_queries[] to sql_command_flags and added more bitmaps to better categorize commands.
This allowed some overall simplifaction when testing sql_command.
Fixes bugs:
Bug#10210: running SHOW STATUS increments counters it shouldn't
Bug#19764: SHOW commands end up in the slow log as table scans
2006-06-20 13:20:32 +03:00
lars@mysql.com
cf2b170d00
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-20 00:08:12 +02:00
anozdrin@booka.site
f237fa7840
Merge mysql.com:/home/alik/MySQL/devel/5.1-tree
...
into mysql.com:/home/alik/MySQL/devel/5.1-rt
2006-06-20 00:54:51 +04:00
rburnett@bk-internal.mysql.com
3edd9cc9c4
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-19 17:50:11 +02:00
svoj@may.pils.ru
6124539b0f
Merge april:devel/BitKeeper/mysql-5.1-engines
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-19 19:57:42 +05:00
bar@bar.intranet.mysql.r18.ru
34b15e6a05
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-19 19:32:08 +05:00
bar@bar.intranet.mysql.r18.ru
9ea82d3566
Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18396
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-19 19:15:03 +05:00
anozdrin@mysql.com
e420873370
Merge mysql.com:/home/alik/MySQL/devel/5.0-rt
...
into mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
2006-06-19 18:10:04 +04:00
gluh@mysql.com
c106b08308
after merge fix
2006-06-19 18:36:27 +05:00
gluh@eagle.intranet.mysql.r18.ru
1d72c66c1b
WL#3015: Logging Improvements - No Restarts(ver N4)
...
Added slow_query_log & general_log global upadatable variables.
Added slow-query-log & general-log startup options.
Added log_output, general_log_file, slow_query_log_file global updatable variables.
2006-06-19 18:30:55 +05:00
anozdrin@mysql.com
4afffb40a8
Merge mysql.com:/home/alik/MySQL/devel/5.0-tree
...
into mysql.com:/home/alik/MySQL/devel/5.0-rt
2006-06-19 16:57:46 +04:00
lars@mysql.com
ad809c6b15
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 13:30:54 +02:00
lars@mysql.com
67e476f29f
BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database)
2006-06-19 13:23:13 +02:00
svoj@may.pils.ru
6a90aede13
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
2006-06-19 16:06:29 +05:00
anozdrin@mysql.com
3b6397b1d2
WL#3298: IM: make command-line option names consistent
...
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
2006-06-19 14:41:29 +04:00
lars@dl145j.mysql.com
9bf46d4844
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-19 12:14:38 +02:00
anozdrin@mysql.com
2e56e82180
Fix of test suite in scope of fixing BUG#18023: IM: instance
...
can be started several times; monitor interval must be > 2sec
2006-06-19 14:13:34 +04:00
lars@mysql.com
5937422a53
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 12:09:24 +02:00
svoj@may.pils.ru
737e166403
Merge april:devel/BitKeeper/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
2006-06-19 14:13:44 +05:00
svoj@may.pils.ru
37cdb0fbf3
BUG#18036 - update of table joined to self reports table as crashed
...
Certain updates of table joined to self results in unexpected
behavior.
The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.
Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.
Only MyISAM tables were affected.
2006-06-19 14:05:14 +05:00
bar@bar.intranet.mysql.r18.ru
f3bda9b73f
Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201
...
into mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-19 11:18:05 +05:00
evgen@moonbone.local
a92a55bb97
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-19 01:16:18 +04:00
evgen@moonbone.local
79c91f6214
Manually merged
2006-06-18 14:56:35 +04:00
evgen@moonbone.local
1aedd2ed3e
Manually merged
2006-06-17 02:57:50 +04:00