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
tomas@poseidon.ndb.mysql.com
0865a5da9b
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-20 19:33:25 +02:00
mikael@dator5.(none)
32c25c8e2f
BUG#16000: .par file not removed plus errors to error log for normal errors
2006-06-20 13:24:30 -04:00
tomas@poseidon.ndb.mysql.com
7be42667f0
Bug #17297 Fix error messages
2006-06-20 19:17:07 +02:00
tomas@poseidon.ndb.mysql.com
f5f9f471d1
Bug #17297 Fix error messages
2006-06-20 19:13:46 +02:00
evgen@moonbone.local
66371d22e2
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-06-20 20:13:37 +04:00
evgen@moonbone.local
75164ffc2f
rpl_ndb_log.result:
...
Fixed failing test case
2006-06-20 20:11:08 +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
tomas@poseidon.ndb.mysql.com
0f55e30fa8
Bug #19543 Out REDO log on subscription creation during startup, missing error message
...
- add error message
2006-06-20 15:45:17 +02: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
kent@mysql.com
34d82f0bc6
make_win_src_distribution.sh:
...
Removed reference to missing "tools" directory
mysql.spec.sh:
Changed flag --with-yassl => --with-ssl
Reverted accidental removal of the "make" call :-)
Configure --with-embedded-server
Corrected path to "libtool" command
Corrected path to "libmysqld.a"
Removed references to "safe_mysqld"
2006-06-20 12:24:12 +02: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
kent@mysql.com
8f0aa436ed
Merge
2006-06-20 11:11:18 +02:00
stewart@mysql.com
337396d19a
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
2006-06-20 18:27:54 +10:00
stewart@mysql.com
9edd7b3766
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/main
2006-06-20 17:33:14 +10:00
stewart@mysql.com
9e05d61a48
BUG#20333 valgrind: mgmd event reporting dep on uninit value
2006-06-20 17:29:02 +10:00
stewart@mysql.com
0d7ea0acd4
fix test result after BUG#20073 fix
2006-06-20 14:24:52 +10:00
lars@mysql.com
94019aed9f
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-20 00:13:20 +02: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
serg@serg.mylan
d4bdf2f447
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-06-19 21:12:31 +02:00
evgen@sunlight.local
6e80c3ec42
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-06-19 22:23:41 +04:00
aelkin@mysql.com
201f8e0479
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2006-06-19 20:26:36 +03:00
serg@serg.mylan
829772b49d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-06-19 19:14:14 +02:00
aelkin@mysql.com
d30425a148
Bug#19881: slave cores at close_temporary_tables under shutdown
...
The bug was found in rpl_stm_000001 testing. In essence the following happens
SLAVE thread receives what happens
start
init THD and its temp_table (tt0)
stop
storing tt0 pointer to rli->save...
start
restoring temp_tables - new pointer tt1
executing regular binlog event DROP temp_table
at the end of which tt1-refered list
must be empty (slave_open_temp_tables == 0)
but the pointer refers to tt0 location!
shutdown
end_slave calls cleaning of temp_tables and crashes.
The reason of the crash is that tt1 values is not zero upon DROPing the single temp table.
This is due to alg of removing links from temp_tables list which "adapted" 5.0 code
but w/o accounting that thd->temporary_tables in slave thread in prone to freeing.
Upon freeing there is no more original '0' value available to denote empty list.
temporary_tables must not refer to any "external" location, one of which thd->temporary_tables represents (since belong to THD instance).
The fix done in sql_base.cc for two functions, look at there for details.
2006-06-19 20:14:14 +03:00
epotemkin@sunlight.local
b1ca33dbdb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-06-19 20:32:07 +04:00
evgen@moonbone.local
9c324f32e7
rpl_row_log.result, rpl_row_log_innodb.result:
...
Fixed failing test case
2006-06-19 20:21:00 +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
23a4a85908
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-19 20:01:24 +05:00
svoj@may.pils.ru
098c1a0303
Merge april:devel/BitKeeper/mysql-5.0-engines
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
2006-06-19 19:58:55 +05: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
stewart@mysql.com
917203ddd7
BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
2006-06-20 00:30:19 +10: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
svoj@may.pils.ru
2c28b3cbf1
Addition to fix for
...
BUG#18036 - update of table joined to self reports table as crashed
Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
2006-06-19 17:50:52 +05:00
serg@serg.mylan
6554329434
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-06-19 13:49:00 +02: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
anozdrin@mysql.com
7ecfadbcf2
Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().
2006-06-19 15:17:15 +04:00
svoj@may.pils.ru
8d802218fb
Merge april:devel/BitKeeper/mysql-5.0-engines
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
2006-06-19 16:11:23 +05:00