mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19920 commits 2784 branches 343 tags 1.6 GiB
Commit graph

5633 commits

Author SHA1 Message Date
mskold@mysql.com
2237d9b745 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-18 10:14:27 +01:00
ingo@production.mysql.com
a7daeaf64f Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1
 2005-11-17 13:44:34 +01:00
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
ingo@mysql.com
aa1f46a819 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
After merge fix.
 2005-11-15 18:01:30 +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
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
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
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
jani@ua141d10.elisa.omakaista.fi
b8248334d9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-11-03 13:02:05 +02:00
jani@ua141d10.elisa.omakaista.fi
d03662cd37 Changed mysql-test-run to correspond to the one in 5.0 tree. 2005-11-03 11:05:52 +02: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
monty@mysql.com
19502e8eb5 Review of new pushed code 
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
 2005-11-01 13:00:02 +02: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
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
ec009d6963 select.result: 
After merge fix
 2005-10-27 18:36:11 +04: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
kent@mysql.com
a2d7a9da90 mysql-test-run.pl: 
Added MTR_BUILD_THREAD to control the port range
 2005-10-26 01:24:03 +02:00
kent@mysql.com
5561697158 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-25 23:56:08 +02: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