Commit graph

51934 commits

Author SHA1 Message Date
ramil/ram@ramil.myoffice.izhnet.ru
92d4ea79ef Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b32676/b32676.5.0
2007-11-29 08:24:52 +04:00
sergefp@foxhole.(none)
1b3e95e1da Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/psergey/mysql-5.1-bug32772
2007-11-28 22:43:52 +03:00
df@pippilotta.erinye.com
4530750499 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-28 19:49:29 +01:00
df@pippilotta.erinye.com
5f21a18f48 use --builddir option for mysql_install_db 2007-11-28 17:36:28 +01:00
df@pippilotta.erinye.com
69ae57ae73 fix make distcheck in a different way 2007-11-28 17:32:28 +01:00
df@pippilotta.erinye.com
8765858d8a Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-28 17:08:40 +01:00
malff@lambda.hsd1.co.comcast.net.
de0175204d Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 09:08:31 -07:00
df@pippilotta.erinye.com
24b4226f1d include data files for parts test suite in distribution 2007-11-28 17:04:02 +01:00
malff@lambda.hsd1.co.comcast.net.
a8bb772392 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 08:49:01 -07:00
malff@lambda.hsd1.co.comcast.net.
fce47dbc9a Manual merge 2007-11-28 08:41:45 -07:00
malff@lambda.hsd1.co.comcast.net.
4e8f8a0178 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 07:42:36 -07:00
davi@endora.local
edd225ff55 Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2007-11-28 12:33:51 -02:00
malff@lambda.hsd1.co.comcast.net.
7c4f906bf3 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-28 07:23:51 -07:00
davi@endora.local
7441f466e2 Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0
into  mysql.com:/Users/davi/mysql/mysql-5.0-runtime
2007-11-28 10:49:30 -02:00
davi@mysql.com/endora.local
bd3f76d767 Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed
Kill of a CREATE TABLE source_table LIKE statement waiting for a
name-lock on the source table causes a bad lock interaction.

The mysql_create_like_table() has a bug that if the connection is
killed while waiting for the name-lock on the source table, it will
jump to the wrong error path and try to unlock the source table and
LOCK_open, but both weren't locked.

The solution is to simple return when the name lock request is killed,
it's safe to do so because no lock was acquired and no cleanup is needed.

Original bug report also contains description of other problems
related to this scenario but they either already fixed in 5.1 or
will be addressed separately (see bug report for details).
2007-11-28 10:18:01 -02:00
gluh@mysql.com/eagle.(none)
3628a7af97 Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
added new func mysql_create_like_schema_frm() which creates frm file based on I_S table
2007-11-28 15:37:00 +04:00
istruewing@stella.local
1a87a089a7 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-28 11:06:40 +01:00
istruewing@stella.local
4d38a04665 Bug#8693 Test 'rpl_log_pos' fails sometimes
Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.
2007-11-28 10:00:23 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
5d9f96af27 Merge mysql.com:/home/ram/work/b32676/b32676.5.0
into  mysql.com:/home/ram/work/b32676/b32676.5.1
2007-11-28 12:49:48 +04:00
istruewing@stella.local
02e321d350 Bug#29149 Test "kill" fails on Windows
Disabled test case.
2007-11-28 09:48:06 +01:00
thek@adventure.(none)
c2c84976d1 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-11-28 09:04:49 +01:00
thek@adventure.(none)
906697768c Error number increased; fixing broken number. 2007-11-28 09:03:21 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
75095711f4 Fix for bug : crash with cast in order by clause and cp932 charset
- fix for  (missed during merging) applied for cp932 charset.
  - tests/results adjusted.
2007-11-28 10:55:13 +04:00
tsmith@ramayana.hindu.god
4f16ab2ea1 Cset exclude: tsmith@ramayana.hindu.god|ChangeSet|20071127191535|13686
This change isn't correct, and the correct one will be pulled in from another
repository.
2007-11-27 17:38:21 -07:00
sergefp@mysql.com
7d6d808b6a BUG#32772: partition crash 1: enum column
The bug was that for ordered index scans, ha_partition::index_init() did
not put index columns into table->read_set if the underlying storage 
engine did not have HA_PARTIAL_COLUMN_READ flag. 
This was causing assertion failure when handle_ordered_index_scan() tried
to sort the records according to index order.

Fixed by making ha_partition::index_init() put index columns into table->read_set
for all ordered scans.
2007-11-28 03:02:05 +03:00
istruewing@stella.local
63e48ec22c Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-27 20:30:03 +01:00
tsmith@ramayana.hindu.god
44ba2ae716 Fix possible use of uninitialized variable during error handling in mysql.cc 2007-11-27 12:15:35 -07:00
tsmith@ramayana.hindu.god
b44d792324 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-11-27 11:38:18 -07:00
istruewing@stella.local
da28f9eac4 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-27 19:29:10 +01:00
istruewing@stella.local
777d79f5fd Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 18:42:59 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e2fa11fb50 after-merge fixup: archive test/result adjusted. 2007-11-27 21:30:00 +04:00
tnurnberg@mysql.com/white.intern.koehntopp.de
46ee271e8f Bug#32707: misdimensioned buffer in protocol layer
Miscalculation in protocol-layer: size buffer correctly so
even really long error messages cannot overflow our buffer.
2007-11-27 18:24:24 +01:00
gkodinov/kgeorge@magare.gmz
3bd26b47e6 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B30355-5.0-opt
2007-11-27 18:58:09 +02:00
istruewing@stella.local
c389535ae9 Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 17:34:03 +01:00
istruewing@stella.local
a167dd0bf4 Bug#8693 Test 'rpl_log_pos' fails sometimes
Disabled the test case.
2007-11-27 17:28:55 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
f03fb473b3 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 20:03:09 +04:00
malff@lambda.hsd1.co.comcast.net.
fc76a4824a Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-27 09:03:04 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
4344785894 Merge mysql.com:/home/ram/work/mysql-5.1-engines
into  mysql.com:/home/ram/work/b30495/b30495.5.1
2007-11-27 20:00:50 +04:00
malff@lambda.hsd1.co.comcast.net.
352e59b37b Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-27 08:56:43 -07:00
gshchepa/uchum@gleb.loc
cbc91811df Merge gleb.loc:/work/bk/5.0-opt-32403
into  gleb.loc:/work/bk/5.0-opt
2007-11-27 19:28:27 +04:00
istruewing@stella.local
a39180c1f2 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 16:24:44 +01:00
gkodinov/kgeorge@magare.gmz
11d268ba47 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B30355-5.0-opt
2007-11-27 17:21:36 +02:00
gkodinov/kgeorge@magare.gmz
0f3db011d5 Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B30355-5.1-opt
2007-11-27 17:19:51 +02:00
gkodinov/kgeorge@magare.gmz
8c3d5135ba Bug : Incorrect ordering of UDF results
There's currently no way of knowing the determinicity of an UDF.
And the optimizer and the sequence() UDFs were making wrong
assumptions about what the is_const member means.
Plus there was no implementation of update_system_tables()
causing the optimizer to overwrite the information returned by
the <udf>_init function.

Fixed by equating the assumptions about the semantics of 
is_const and providing a implementation of update_used_tables().
Added a TODO item for the UDF API change needed to make a better 
implementation.
2007-11-27 17:16:52 +02:00
gshchepa/uchum@gleb.loc
97ac0c273f Fixed bug : query causes a crash due to stack and
memory corruptions.

The right pointer field of the SEL_ARG structure was not
initialized in the constructor and sometimes that led to
server crashes.

There is no testcase because the bug occurs only when
uninitialized memory has particular values, which can't be
re-created in the test suite.
2007-11-27 19:14:48 +04:00
hhunger@hh-nb.hhunger
cb33d0dcdf Merge hh-nb.hhunger:/work/trees/mysql-5.0-build-src-clean
into  hh-nb.hhunger:/work/merge/mysql-5.0-build
2007-11-27 13:02:40 +01:00
hhunger@hh-nb.hhunger
ab12b26671 Merge hh-nb.hhunger:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hhunger:/work/merge/mysql-5.1-build
2007-11-27 13:01:27 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
14e74e82e8 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 15:15:28 +04:00
mkindahl@dl145h.mysql.com
b1428496df Disabling several tests that fail and reported as errors. 2007-11-27 11:02:00 +01:00
svoj@mysql.com/april.(none)
a4d2d87395 BUG#32050 - table logging gone wrong.
INSERT/UPDATE against CSV table created by MySQL earlier than 5.1.23
with NULL-able column results in server crash in debug builds.

Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
but it is still possible to get such table from older MySQL versions.

Fixed by removing excessive DBUG_ASSERT().
2007-11-27 14:01:11 +04:00