Commit graph

4666 commits

Author SHA1 Message Date
mskold@mysql.com
77cbf5d3ff Fixed incorrectly use if table with wrong schema version 2005-11-17 12:45:23 +01:00
sasha@asksasha.com
0b275de13f Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-16 21:18:13 -07:00
sasha@asksasha.com
eac88b685c fixed the race condition in the test case for BUG#7947 2005-11-16 21:17:38 -07:00
ingo@mysql.com
1237c2fbcc Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-11-16 21:33:38 +01:00
pekka@mysql.com
a6e410dd4e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1
2005-11-16 13:28:54 +01:00
pekka@mysql.com
a8ce4d27ce ndb - bug#14007 4.1 [re-commit for LenZ merge] 2005-11-16 11:52:09 +01:00
sasha@asksasha.com
cb6d69f6f4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-15 13:38:48 -07:00
sasha@asksasha.com
9986a357ec merged in the test case for BUG#7947 2005-11-15 13:38:06 -07:00
ingo@mysql.com
6bc4636b64 Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-11-15 18:09:40 +01:00
bell@sanja.is.com.ua
297639bdbe Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138) 2005-11-15 18:14:53 +02:00
ingo@mysql.com
1aa15c25c7 Merge mysql.com:/home/mydev/mysql-4.0-bug14397
into  mysql.com:/home/mydev/mysql-4.0-4000
2005-11-15 16:47:15 +01:00
ingo@mysql.com
8996fd40cf Merge mysql.com:/home/mydev/mysql-4.0-bug14616
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-11-15 16:07:05 +01:00
bar@mysql.com
8894bd8d55 Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES
ps_grant.result:
  Fixing result order.
grant.result:
  Adding test case,
  fixing result order.
grant.test:
  Adding test case.
sql_acl.cc:
  Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info.
  This problem was previously fixed by Ingo in 5.0.
  This patch is basically a backport of the same changes into 4.1.
2005-11-14 16:36:06 +04:00
svoj@mysql.com
5d8cefe0b4 Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8 2005-11-12 11:25:14 +04:00
sergefp@mysql.com
f12212f74e BUG#14480: post-fix: use the default field value from CREATE list too. 2005-11-09 09:34:46 +03:00
pappa@c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se
2a0f8e6434 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-11-08 00:40:49 -05:00
pappa@c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se
4282ad92cb Bug #12796: Record lost in HEAP table
Two handler objects were present, one was used for an insert and the other for a select
The state of the statistics was local to the handler object and thus the other handler
object didn't notice the insert.
Fix included:
1) Add a new variable key_stat_version added to whenever statistics was considered in need
of update (previously key_stats_ok= FALSE in those places)
2) Add a new handler variable key_stat_version assigned whenever key_stats_ok= TRUE was set
previously
3) Fix records_in_range to return records if records <= 1
4) Fix records_in_range to add 2 to rec_per_key to ensure we don't specify 0 or 1 when it isn't
and thus invoking incorrect optimisations.
5) Fix unique key handling for HEAP table in records_in_range
2005-11-08 00:26:37 -05:00
sasha@asksasha.com
637c800191 changed select release_lock() to do release_lock() to avoid having to compare the
non-deterministic result in the test case for BUG#7947
the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which
in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS
2005-11-07 20:51:30 -07:00
sergefp@mysql.com
41bc233699 Merge mysql.com:/home/psergey/mysql-4.1-bug13814
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:36:25 +03:00
sergefp@mysql.com
5656740542 Merge mysql.com:/home/psergey/mysql-4.1-bug14480
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:34:56 +03:00
sasha@asksasha.com
aaaee3f23b Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-07 15:10:48 -07:00
sasha@asksasha.com
41752fa9a0 fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.
2005-11-07 15:09:35 -07:00
ingo@mysql.com
1f3df2e669 Bug#14616 - Freshly imported table returns error 124 when using LIMIT
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.
2005-11-07 12:16:49 +01:00
sergefp@mysql.com
edd094b194 BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice
when calculating table->null_fields.
2005-11-07 09:23:43 +03:00
ramil@mysql.com
2467674b73 Fix for bug #13044: BIT_COUNT with NULL values. 2005-11-06 12:35:49 +04:00
petr@mysql.com
038b300753 Fix Bug#14672 Bug in deletion 2005-11-06 02:11:12 +03:00
petr@mysql.com
a1f56ea5a6 Fix Bug#13894 Server crashes on update of CSV table 2005-11-05 15:08:15 +03:00
ingo@mysql.com
1b99d30c23 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Version for 4.0.
It fixes two problems:
1. The cause of the bug was that we did not check the table version for
   the HANDLER ... READ commands. We did not notice when a table was
   replaced by a new one. This can happen during ALTER TABLE, REPAIR
   TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
   for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
   Though the function comment clearly said it must.
   I changed the code so that the locking is done when required. I call
   the fix for this problem "the secondary fix".
2005-11-03 18:24:12 +01:00
holyfoot@mysql.com
284f652980 Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.14183
2005-11-03 12:50:28 +04:00
evgen@moonbone.local
47059b89f5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14186-bug-4.1-mysql
2005-11-01 17:34:19 +03:00
hf@deer.(none)
bb17195a1c Fix for bug #14183 (ctype_cp983.test fails with the embedded server) 2005-11-01 13:18:46 +04:00
hf@deer.(none)
5150bd8f9f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.12839
2005-10-31 12:24:43 +04:00
jimw@mysql.com
b919b29da6 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:52:10 -07:00
patg@krsna.patg.net
22fe31e4d4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475 Merge mysql.com:/home/jimw/my/mysql-4.1-13796
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:19:19 -07:00
jimw@mysql.com
e55f906130 Fix bug in handling of decimal fields in UNION statements that could
cause a crash or write to an incorrect memory location. (Bug #14216)
2005-10-28 18:12:57 -07:00
sergefp@mysql.com
8b9bab2763 Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
do advance the source pointer over 2 bytes that specify value length.
2005-10-28 23:31:32 +04:00
sergefp@mysql.com
f220d87476 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug14139
2005-10-28 21:42:01 +04:00
evgen@moonbone.local
cc5d7c0715 Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server
Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only 
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.

Because fields_list used not only to send data ad fields types, it's wrong 
to allow procedure redefine it. This patch separates select's fileds_list 
and procedure's one. Now if procedure is present, copy of fields_list is 
created in procedure_fields_list and it is used for sending data and fields.
2005-10-28 15:24:46 +04:00
evgen@moonbone.local
77723c2438 Fix bug#14186 select datefield is null not updated
Date field was declared as not null, thus expression 'datefield is null'
was always false. For SELECT special handling of such cases is used. 
There 'datefield is null' converted to 'datefield eq "0000-00-00"'.

In mysql_update() before creation of select added remove_eq_conds() call.
It makes some optimization of conds and in particular performs conversion
from 'is null' to 'eq'. 
Also remove_eq_conds() makes some evaluation of conds and if it founds that
conds is always false then update statement is not processed further.
All this allows to perform some update statements process faster due to
optimized conds, and not wasting resources if conds known to be false.
2005-10-28 01:24:11 +04:00
jimw@mysql.com
7a8bd252d2 Merge mysql.com:/home/jimw/my/mysql-4.1-14009
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-27 10:20:38 -07:00
evgen@moonbone.local
71b731e92e Manually merged 2005-10-27 17:44:28 +04:00
bar@mysql.com
dfe9480497 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13347
2005-10-27 13:41:09 +05:00
patg@krsna.patg.net
bd0497ce3b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-26 09:22:47 -07:00
patg@krsna.patg.net
7243b7bb49 BUG# 12123
Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.
2005-10-25 14:50:08 -07:00
sergefp@mysql.com
2219ada7f6 BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space 
required for field_X in the new table.
2005-10-26 00:56:17 +04:00
jimw@mysql.com
a01cd74647 Merge mysql.com:/home/jimw/my/mysql-4.1-12925
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-25 10:11:47 -07:00
jimw@mysql.com
e8eed35c6a Fix incorrect casts in my_getopt code that capped the maximum of longlong
options to the wrong value. (Bug #12925)
2005-10-25 10:10:53 -07:00
evgen@moonbone.local
b5d426623f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14016-bug-4.1-mysql
2005-10-25 20:37:45 +04:00
evgen@moonbone.local
90cf3e78f0 Fix bug #14016 date_format() 2nd parameter was compared using case insensitive
collation

By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and 
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
column to sort by.

Now if second parameter of date_format() is constant then it's collation is 
changed to case sensitive.
2005-10-25 20:37:26 +04:00