Commit graph

35380 commits

Author SHA1 Message Date
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
knielsen@mysql.com
b70da9a23f BUG#20598
Fix race between cleanup and thread kill at server shutdown that would
sometimes prevent proper cleanup, leading to Valgrind warnings.
2006-06-21 12:27:24 +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
monty@mysql.com
f93d85ea22 Fixed typo that was forgot in last changeset. 2006-06-21 13:24:06 +03:00
mskold@linux.site
a2fad11caa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-21 12:02:03 +02:00
tomas@poseidon.ndb.mysql.com
c360810ddb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-21 12:02:02 +02:00
gluh@eagle.intranet.mysql.r18.ru
8097ba2046 after merge fixes 2006-06-21 14:53:40 +05: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
bar@mysql.com
bfae7303d7 Bug#20086: Can't get data from key partitioned tables with VARCHAR key
The problem appeared because the same values produced different hash
during INSERT and SELECT for VARCHAR data type.
Fix:
VARCHAR required special treatment to avoid hashing of length bytes
(leftmost one or two bytes) as well as trailing bytes beyond real length,
which could contain garbage. Fix is done by introducing hash() - new method
in the Field class.
2006-06-21 13:00:19 +05:00
mskold@mysql.com
7fdf6f1633 Fixed failed automerge 2006-06-21 09:51:08 +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
tomas@poseidon.ndb.mysql.com
f072f7cbb5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-21 08:49:40 +02:00
anozdrin@mysql.com
bb94cb24c5 Re-enable IM tests. 2006-06-21 02:17:39 +04:00
anozdrin@mysql.com
ddaebd13dc Fix merge 5.0 -> 5.1. 2006-06-21 02:16:38 +04:00
anozdrin@booka.site
3a6ad23f43 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-21 02:00:49 +04:00
evgen@moonbone.local
6b694bcd58 rpl_ndb_log.result:
Corrected test case result
2006-06-21 00:45:01 +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
joerg@mysql.com
27df8b07b7 Fix for bug#18516 (also #19353, reported for 5.1):
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
2006-06-20 22:40:46 +02: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)
3505cdb0e5 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug16000
2006-06-20 16:07:55 -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
elliot@mysql.com
6043f29810 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/mysql-5.0-heikki
2006-06-20 13:44:36 -04:00
elliot@mysql.com
37e5ec9f50 Applying patch from SergeyV
Fixes bug#17264, for alter table on win32 for successfull operation completion
it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
race condition when several clients do alter table simultaneously.
2006-06-20 13:43:13 -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
iggy@mysql.com
c6d2a56b22 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/mnt/storeage/mysql-5.0
2006-06-20 11:32:16 -04: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
evgen@sunlight.local
d0d32f7d11 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sunlight.local:/home/evgen/tmp_merge-5.0-opt-mysql
2006-06-20 15:44:33 +04:00
evgen@moonbone.local
71f0fe3dca item_cmpfunc.cc:
After merge fix
2006-06-20 15:40:10 +04:00
evgen@moonbone.local
314b897fbf func_time.result:
After merge fix
2006-06-20 15:35:54 +04: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