igor@rurik.mysql.com
10cc5a46df
olap.result, olap.test:
...
Added test cases for bug #7894 .
sql_select.cc:
Fixed bug #7894 : GROUP BY queries with ROLLUP returned
wrong results for expressions containing group by columns.
The fix ensured correct results by replacement of all
occurrences of group by fields in non-aggregate expressions
for corresponding ref objects and preventing creation of
fields in temporary tables for expression containing group
by fields.
2005-05-30 03:01:51 -07:00
pem@mysql.com
e496b24304
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-30 11:06:31 +02:00
evgen@moonbone.local
329d974df7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-9593
2005-05-30 03:34:20 +04:00
evgen@moonbone.local
077086cd96
Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the
...
server"
Bug appears only on Windows platform. Freeing memory in
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in
setup_copy_fields() results in memory destruction. In test IF used instead
of CONCAT because IF have more stable crash.
2005-05-30 03:32:50 +04:00
serg@serg.mylan
6ef172efb8
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-28 10:44:49 +02:00
patg@radha.local
019288c623
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-5.0
2005-05-28 09:00:29 +02:00
jimw@mysql.com
2f0c098ef5
Fix '%h', '%I', and '%l' format specifiers in TIME_FORMAT()
...
to handle large time values as documented. (Bug #10590 )
2005-05-27 16:41:53 -07:00
serg@serg.mylan
29d6af8d9a
merged
2005-05-28 01:28:18 +02:00
patg@radha.local
d3d727e328
Comment and test changes per review request by Timour. All tests pass on production with this code.
2005-05-27 22:07:46 +02:00
msvensson@neptunus.(none)
a07d8b1951
Merge neptunus.(none):/home/msvensson/mysql/bug9993
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 17:22:19 +02:00
pem@mysql.comhem.se
4c49970e0f
Fixed BUG#8409: Stored procedure crash if function contains FLUSH
...
by simply disabling FLUSH for stored functions. (I can't really work.)
2005-05-27 16:19:25 +02:00
pem@mysql.comhem.se
fcb3b0326e
Fixed BUG#9559: Functions: Numeric Operations using -ve value gives incorrect
...
results.
Actually a problem when converting decimal to int for user variables.
2005-05-27 14:48:33 +02:00
msvensson@neptunus.(none)
aa99b05be7
Fix rpl_log and rpl_rotate_logs test result
...
- Remove the expected warrnings when "show binary logs" are called on zero size binary log files.
2005-05-27 12:01:41 +02:00
msvensson@neptunus.(none)
ed6b9812f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 10:10:16 +02:00
lars@mysql.com
54bf811ada
BUG#6883: Added implicit commit for CREATE TABLE, TRUNCATE TABLE and DROP/CREATE DATABASE
2005-05-27 04:17:33 +02:00
monty@mysql.com
f8cb00640f
Fix broken test case (after merge)
2005-05-26 23:33:20 +03:00
joreland@mysql.com
7be75f0a79
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 21:30:26 +02:00
msvensson@neptunus.(none)
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
dbcf3b3a2e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 20:02:21 +02:00
joerg@mysql.com
5178c84bef
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-05-26 18:12:56 +02:00
bell@sanja.is.com.ua
b186d8b4f9
merge
2005-05-26 18:33:57 +03:00
joerg@mysql.com
76b25fc194
Corrected merge error in 'mysql-test/r/select.result': two test blocks inserted in wrong order.
2005-05-26 16:47:44 +02:00
msvensson@neptunus.(none)
8401cd5d79
BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables
...
- Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables
- Renamed view_skip_grants to skip_grants and added test cases for this
2005-05-26 16:44:46 +02:00
bell@sanja.is.com.ua
db2ce1edf6
fixed problem with long string results of expressions in UNIONS (BUG#10025)
2005-05-26 17:30:12 +03:00
joreland@mysql.com
8bba533f86
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 14:07:31 +02:00
joerg@mysql.com
f39f049041
Merge
2005-05-26 12:55:31 +02:00
joerg@mysql.com
9504bd0ddd
Manual merge.
2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
975ca22872
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
128074d91a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug9879
2005-05-26 11:25:25 +02:00
joreland@mysql.com
cdac1d9c07
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-26 06:49:07 +02:00
jimw@mysql.com
aac55df4f4
Fix table renaming to not lowercase table names for all storage
...
engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660 )
2005-05-25 20:26:40 -07:00
jimw@mysql.com
ef9ef1f958
Fix partial keys when converting VARCHAR to TEXT. (Bug #10543 )
2005-05-25 18:11:47 -07:00
kent@mysql.com
e2955a2f13
init_db.sql:
...
Updated test data in system tables
2005-05-26 02:07:13 +02:00
kent@mysql.com
3d4a494189
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-05-26 01:38:29 +02:00
tulin@mysql.com
264de67fc6
Bug #10838 CREATE TABLE produces strange DEFAULT value
2005-05-25 17:54:36 +02:00
msvensson@neptunus.(none)
0ed2e57731
Use one err file for each master
2005-05-25 11:10:10 +02:00
joreland@mysql.com
4bedcb7cab
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-25 09:27:46 +02:00
joreland@mysql.com
c448ab53d6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-25 09:26:59 +02:00
patg@radha.local
a6af23a046
changes to fix joins not working (bug #10848 ). New tests, as well as table->status being set in index_read_idx
2005-05-25 02:15:09 +02:00
acurtis@xiphis.org
248a6934bb
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p3-bug7241.6
2005-05-24 22:51:02 +01:00
acurtis@xiphis.org
9c8b4c93bb
Fix after merge
2005-05-24 22:31:57 +01:00
Sinisa@sinisa.nasamreza.org
e94f4fa8e0
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 22:44:18 +03:00
jimw@mysql.com
bbdfea15da
Increase limit of partial key length in MEMORY storage engine
...
to the same as a full key. (Bug #10566 )
2005-05-24 12:21:15 -07:00
mskold@mysql.com
bf7f0508e2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-24 21:18:07 +02:00
dlenev@mysql.com
1449d44e1c
Manual merge of patch fixing several trigger related bugs with main tree.
2005-05-24 22:35:41 +04:00
dlenev@brandersnatch.localdomain
007a205918
Fix for bugs:
...
#5860 "Multi-table UPDATE does not activate update triggers"
#6812 "Triggers are not activated for INSERT ... SELECT"
#8755 "Trigger is not activated by LOAD DATA".
This patch also implements proper handling of triggers for special forms
of insert like REPLACE or INSERT ... ON DUPLICATE KEY UPDATE.
Also now we don't call after trigger in case when we have failed to
inserted/update or delete row. Trigger failure should stop statement
execution.
I have not properly tested handling of errors which happen inside of
triggers in this patch, since it is simplier to do this once we will be
able to access tables from triggers.
2005-05-24 22:19:33 +04:00
brian@zim.(none)
46a3eef67d
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-05-24 10:48:03 -07:00
Sinisa@sinisa.nasamreza.org
df53be3dfe
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 19:47:18 +03:00
jani@ua141d10.elisa.omakaista.fi
ed2e508bdd
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-05-24 18:23:31 +03:00
joreland@mysql.com
6132b0a528
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-24 17:05:20 +02:00