Commit graph

30856 commits

Author SHA1 Message Date
rburnett@bk-internal.mysql.com
3c6a8146be Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-06-26 16:56:28 +02:00
knielsen@mysql.com
13a67a9fea Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.0
into  mysql.com:/data0/knielsen/tmp-5.0
2006-06-24 16:44:41 +02:00
knielsen@mysql.com
34cf139bd9 Fix race condition in test case wait_timeout.
Sometimes the helper connection (that is watching for the main connection
to time out) would itself time out first, causing the test to fail.
2006-06-24 13:11:09 +02:00
evgen@moonbone.local
c74cc18789 key.result:
After merge fix
2006-06-23 19:36:54 +04:00
bar@mysql.com
ee8fd1e3b5 Bug#15276: MySQL ignores collation-server
Problem:
    mysqld --collation-server=xxx --character-set-server=yyy
    didn't work as expected: collation_server was set not to xxx,
    but to the default collation of character set "yyy".
    
    With different argument order it worked as expected:
    mysqld --character-set-server=yyy --collation-server=yyy 
    
    Fix:
    initializate default_collation_name to 0
    when processing --character-set-server
    only if --collation-server has not been specified
    in command line.
2006-06-23 18:00:49 +05:00
evgen@moonbone.local
e74c47fb04 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 16:09:33 +04:00
evgen@moonbone.local
9a9224da68 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 14:53:41 +04:00
bar@mysql.com
13fdfea032 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-kt
into  mysql.com:/usr/home/bar/mysql-5.0-kt.b20392
2006-06-23 13:38:16 +05:00
bar@mysql.com
cfb08851f7 Bug#11228: DESC shows arbitrary column as "PRI"
An UNIQUE KEY consisting of NOT NULL columns
  was displayed as PRIMARY KEY in "DESC t1".
  According to the code, that was intentional
  behaviour for some reasons unknown to me.
  This code was written before bitkeeper time,
  so I cannot check who and why made this.
  After discussing on dev-public, a decision
  was made to remove this code
2006-06-23 13:19:30 +05:00
kent@mysql.com
ef2860e8ff mysql.spec.sh:
Disable the simplistic auto dependency scan for test/bench (bug#20078)
2006-06-23 00:37:31 +02:00
konstantin@mysql.com
40a1c179e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-23 00:01:30 +04:00
pekka@clam.ndb.mysql.com
04b178f451 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781
2006-06-22 20:59:03 +02:00
kroki@mysql.com
2811ce2a20 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15811
2006-06-22 21:54:06 +04:00
konstantin@mysql.com
8a2bf1cc7d Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-22 21:06:09 +04:00
kroki@mysql.com
b7d8d6f402 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15811
2006-06-22 19:48:44 +04:00
konstantin@mysql.com
e20898a507 A fix and a test case for Bug#15217 "Using a SP cursor on a table created
with PREPARE fails with weird error".
More generally, re-executing a stored procedure with a complex SP cursor query
could lead to a crash.

The cause of the problem was that SP cursor queries were not optimized 
properly at first execution: their parse tree belongs to sp_instr_cpush,
not sp_instr_copen, and thus the tree was tagged "EXECUTED" when the
cursor was declared, not when it was opened. This led to loss of optimization
transformations performed at first execution, as sp_instr_copen saw that the
query is already "EXECUTED" and therefore either not ran first-execution 
related blocks or wrongly rolled back the transformations caused by 
first-execution code.
The fix is to update the state of the parsed tree only when the tree is
executed, as opposed to when the instruction containing the tree is executed.
Assignment if i->state is moved to reset_lex_and_exec_core.
2006-06-22 19:29:48 +04:00
kroki@mysql.com
3b58c95d6e Bug#15811: extremely long time for mysql client to execute long INSERT
The problem was in redundant calls to strlen() in string functions,
where we may then return after checking only the small number of characters.

No test case is provided since it's a performance fix.
2006-06-22 19:15:03 +04:00
evgen@moonbone.local
3ef768b763 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-22 18:59:44 +04:00
bar@mysql.com
75351dc0a5 Additional test for Bugs#20392: INSERT_ID session variable has weird value
sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID,
as Guilhem suggested.
2006-06-22 19:40:59 +05:00
bar@mysql.com
4bd163b698 Bugs#20392: INSERT_ID session variable has weird value
sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID.
2006-06-22 19:10:11 +05:00
evgen@moonbone.local
c948256692 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-22 01:16:57 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fa98891ee7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 23:54:06 +03:00
evgen@moonbone.local
e39e665390 Manual merge 2006-06-22 00:49:17 +04:00
evgen@moonbone.local
36a436adae Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-22 00:45:42 +04:00
evgen@moonbone.local
6439337bb1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-06-22 00:29:47 +04:00
evgen@moonbone.local
8d4a910a1f Fixed bug #14896.
This bug in Field_string::cmp resulted in a wrong comparison 
with keys in partial indexes over multi-byte character fields.
Given field a is declared as a varchar(16) collate utf8_unicode_ci
INDEX(a(4)) gives us an example of such an index.
  
Wrong key comparisons could lead to wrong result sets if 
the selected query execution plan used a range scan by 
a partial index over a utf8 character field.
This also caused wrong results in many other cases.
2006-06-22 00:29:04 +04:00
mats@mysql.com
9025bcfb4e Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/bk/fix-mysql-5.0
2006-06-21 20:08:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
5b7827b238 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 18:40:50 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
b40ee2a7aa Merge bk://localhost:5559
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 18:39:46 +03:00
jani@ua141d10.elisa.omakaista.fi
f57cf654f4 Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper" 2006-06-21 18:35:19 +03:00
svoj@may.pils.ru
ffd8ea244d Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0
2006-06-21 19:41:09 +05:00
svoj@may.pils.ru
fedbbf4865 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
2006-06-21 19:41:08 +05:00
tomas@poseidon.ndb.mysql.com
5f46cb7e1a added missing MYSQLTEST_VARDIR declaration 2006-06-21 16:41:07 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
143648c35e Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 16:55:47 +03:00
rburnett@bk-internal.mysql.com
8de02df8a9 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-06-21 15:37:09 +02:00
svoj@may.pils.ru
e560564cfa Merge april:devel/BitKeeper/mysql-4.1
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
2006-06-21 17:51:16 +05:00
svoj@may.pils.ru
8b98be2844 BUG#20357 - Got error 124 from storage engine using MIN and MAX
functions in queries

Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.

The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.

This patch skips disabled indexes for min/max optimization.
2006-06-21 17:30:59 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
d3773117a5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
2006-06-21 14:52:02 +03:00
knielsen@mysql.com
66bdb6de02 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0
into  mysql.com:/data0/knielsen/mysql-5.0
2006-06-21 12:59:19 +02:00
knielsen@mysql.com
8167b2c8ef BUG#20578
Backport Valgrind suppression from mysql-5.1:

D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
P mysql-test/valgrind.supp
C Remove warning that may happens becasue threads dies in different order
2006-06-21 12:52:59 +02:00
joerg@mysql.com
e9fda5b23e Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M50/autopush-5.0 2006-06-21 12:29:30 +02:00
gkodinov@mysql.com
bca6492927 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
into  mysql.com:/home/kgeorge/mysql/5.0/B18080
2006-06-21 13:06:32 +03:00
mskold@mysql.com
22334907fc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-21 12:03:08 +02:00
tomas@poseidon.ndb.mysql.com
0b247f8092 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-21 12:03:07 +02:00
gkodinov@mysql.com
f327a8c536 merge of the changes for bug #18080 2006-06-21 13:03:06 +03:00
gkodinov@mysql.com
4f8f4cd51a manual merge 2006-06-21 13:01:00 +03:00
gkodinov@mysql.com
bee985af35 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
into  mysql.com:/home/kgeorge/mysql/5.0/B20482
2006-06-21 12:59:34 +03:00
gkodinov@mysql.com
75ca055493 Bug #20482: failure on Create join view with sources views/tables in different
schemas
The function check_one_table_access() called to check access to tables in 
SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
in the context of setup_tables_and_check_access().
That's why the check_one_table() was split into two : the functionality needed by
setup_tables_and_check_access() into check_single_table_access() and the rest of 
the functionality stays in check_one_table_access() that is made to call the new
check_single_table_access() function.
2006-06-21 12:12:46 +03:00
mskold@mysql.com
f0bd8a7cd9 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-21 09:50:41 +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