mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13997 commits 2780 branches 343 tags 1.6 GiB
Commit graph

3591 commits

Author SHA1 Message Date
vva@eagle.mysql.r18.ru
5406709672 fixed Bug #4358 Problem with HAVING clause that uses alias 
from the select list and TEXT field 

make setup_copy_fields to insert Item_copy_string for blobs in 
the beginning of the copy_funcs (push_back instead of push_front)

the thing is that Item_copy_string::copy for function can call 
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before, 
it's value will be wrong.

So all the Item_copy_string::copy for blobs should be called before 
Item_copy_string::copy for functions.
 2004-08-12 20:37:31 +05:00
ram@gw.mysql.r18.ru
0f0b1ebe62 Added initial sorting in order to make test case repeatable. 2004-08-12 16:16:38 +05:00
guilhem@mysql.com
5332e74a4f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-08-12 13:13:22 +02:00
guilhem@mysql.com
6345dc4fbd Fix for BUG#4678 "mysql-test-run fails on grant_cache": 
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).
 2004-08-12 13:12:09 +02:00
ram@gw.mysql.r18.ru
a8d3ad5e59 Added initial sorting in order to make test case repeatable. 2004-08-12 16:02:12 +05:00
joreland@mysql.com
a454b977d2 Reenable diskless for faster mysql-test-run 2004-08-12 12:40:35 +02:00
joreland@mysql.com
0991df9656 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-12 12:29:41 +02:00
ram@gw.mysql.r18.ru
494a3b0559 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
 2004-08-12 14:59:33 +05:00
ram@gw.mysql.r18.ru
407bf3c759 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4878
 2004-08-12 14:50:29 +05:00
ram@gw.mysql.r18.ru
955e869d7c A test case (bug #4898: User privileges depending on ORDER BY Settings of table db) 2004-08-12 14:49:16 +05:00
wax@mysql.com
37b46ed217 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
 2004-08-12 14:21:35 +06:00
mskold@mysql.com
b3e1dc445f Added tests for fix of bug#4730 2004-08-12 10:15:53 +02:00
ram@gw.mysql.r18.ru
74c64904c7 A fix (Bug #4878: Service crashes on query execution) 2004-08-12 11:28:39 +05:00
joreland@mysql.com
c53b138644 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-12 07:46:12 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
259bce85b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411
 2004-08-11 23:26:44 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
bc78a46ac4 Bug#4411 
Fix for server hang bug
 2004-08-11 23:24:36 +01:00
serg@serg.mylan
9a938cc009 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-08-11 23:44:08 +02:00
serg@serg.mylan
6023b58b9f Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow 2004-08-11 23:43:41 +02:00
sergefp@mysql.com
4ddeee9d2f Fix for BUG#4488: first portion: sign aware '<' and '>' comparisons. 2004-08-11 23:08:20 +04:00
bar@mysql.com
a554f7756d ctype_uca.test, ctype_uca.result, ctype-uca.c: 
Slovak collation didn't work: typo fix in the tailoring rules
 2004-08-11 18:06:20 +05:00
lenz@mysql.com
f78ec279e9 - fixed non-predictable floating point results in func_math by adding 
format() around them (as suggested by serg)
 2004-08-11 13:11:59 +02:00
joreland@mysql.com
294958a707 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-11 12:38:11 +02:00
joreland@mysql.com
0e287e536e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-11 12:00:59 +02:00
joreland@mysql.com
525ed9f314 Can't use diskless when memset has been removed 2004-08-11 12:00:35 +02:00
wax@mysql.com
33c976e11a Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
 2004-08-11 15:17:20 +06:00
bar@mysql.com
127cf25c01 ctype_recoding.result, ctype_recoding.test, sql_show.cc: 
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
 2004-08-11 14:03:24 +05:00
serg@serg.mylan
902518ae48 allow get_format(TIMESTAMP, ...) syntax 2004-08-11 10:27:19 +02:00
joreland@mysql.com
a15b4e5143 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-10 17:42:51 +02:00
mskold@mysql.com
0625aef8c0 Bug fix for bug#3912 2004-08-10 14:38:24 +02:00
wax@mysql.com
08acf5ae7e Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
 2004-08-10 15:49:58 +06:00
mskold@mysql.com
a5dd9f8bb4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-10 11:48:43 +02:00
wax@kishkin.ru
d3f1a6f0cb BUG#4315 
BUG#4535
BUG#4686
 2004-08-10 15:48:22 +06:00
dlenev@brandersnatch.localdomain
f49d4f5350 Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server". 
Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones.
 2004-08-10 12:42:31 +04:00
dlenev@brandersnatch.localdomain
bcbbfc3bb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756
 2004-08-10 03:07:07 +04:00
serg@serg.mylan
e1e1c39bda cleanup 2004-08-07 23:18:13 +02:00
dlenev@brandersnatch.localdomain
f325a92b0a Fix for bug #4491 "timestamp(19) doesn't work". 
We should allow 19 as length of newly created TIMESTAMP fields.
 2004-08-06 12:15:40 +04:00
magnus@neptunus.(none)
744af07953 Increase value of TimeBetweenWatchDogCheck to make it to start cluster on lowend machines. 2004-08-06 09:41:44 +02:00
dlenev@brandersnatch.localdomain
1902790634 Fix for bug #4756 "STR_TO_DATE() returning bad results with AM/PM". 
Added support of converion specifiers mentioned in manual but missing in code.
 2004-08-06 10:01:29 +04:00
magnus@neptunus.(none)
d526f3277e BUG#4892 TRUNCATE TABLE returns error 156 
Added NDBCLUSTER to table types which does not support generate. 
Added test case for truncate.
 2004-08-04 11:28:36 +02:00
magnus@neptunus.(none)
1c65da2cbc BUG#4818 DELETE FROM tab LIMIT 
Check if there are any operations pending that needs to be taken over to the updating/deleting transaction before closing the scan
 2004-08-04 10:54:42 +02:00
serg@serg.mylan
dec992d8fb hang in dummy natural join (no common columns) Bug #4807 2004-08-02 11:12:11 +02:00
serg@serg.mylan
c105f1ed8b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-01 16:35:35 +02:00
joreland@mysql.com
29b5faf06f Fix mysql-test-run w.r.t NDB 
"export A=var" is bash feature
instead do "A=var; export A"
 2004-08-01 14:12:45 +02:00
serg@serg.mylan
f4244cd00e bug#4816. index search for NULL in blob 2004-08-01 13:26:01 +02:00
serg@serg.mylan
22ca5582d0 BUG#4393, BUG#4356 - incorrect decimals in fix_length_and_dec() in some functions 2004-07-31 22:39:10 +02:00
mskold@mysql.com
268c1a2edc Bug fix for alter table and auto_increment 2004-07-31 12:00:12 +02:00
serg@serg.mylan
2852862c68 apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through 2004-07-30 22:05:08 +02:00
serg@serg.mylan
f66b4a1be4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 14:25:18 +02:00
serg@serg.mylan
c5e2fbcc53 no_auto_value_on_zero + alter table bug 2004-07-30 14:17:12 +02:00
pem@mysql.comhem.se
f0cd209373 Updated ps_6bdb.results. 2004-07-30 12:13:40 +02:00
serg@serg.mylan
9bbdb794f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 09:50:37 +02:00
serg@serg.mylan
3a17ab4551 auto_value_on_zero bug test 2004-07-30 09:47:56 +02:00
dlenev@brandersnatch.localdomain
789037d901 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492
 2004-07-30 11:01:29 +04:00
guilhem@mysql.com
da55194eb4 rpl_relayrotate.test requires InnoDB (because what we want to test is 
if slave resumes at BEGIN).
 2004-07-30 01:10:21 +02:00
guilhem@mysql.com
2b6151c20f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-07-29 23:28:28 +02:00
guilhem@mysql.com
0f3e279a05 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position 
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).
 2004-07-29 23:25:58 +02:00
mskold@mysql.com
f05c7ce7c6 Added test for fix of bug#3912 Auto increment not correctly initialised when table is altered 2004-07-29 14:02:40 +02:00
mskold@mysql.com
24f9a2e9bb Added ORDER BY to ensure same result on all setups/platforms 2004-07-29 13:32:50 +02:00
magnus@neptunus.(none)
10583f05c9 Added order by to make the test output from ndb_basic and ndb_lock predicatble 2004-07-28 10:28:30 +02:00
dlenev@brandersnatch.localdomain
d39fe2623f Fix for bug #4492. 
TIMESTAMP columns should be unsigned to preserve compatibility with 4.0
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).

Altough this fix will introduce problems with early 4.1 -> 4.1 upgrades (tables with 
TIMESTAMP field should be reloaded using mysqldump) it will allow easy 4.0 -> 4.1 
upgrade (which is more important since 4.1 is still beta).
 2004-07-28 10:49:21 +04:00
mskold@mysql.com
97d1cf9f3a Merge 2004-07-27 13:02:50 +02:00
magnus@neptunus.(none)
8b9d8b4118 Merge 2004-07-27 11:57:04 +02:00
mskold@mysql.com
894501a1c9 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
 2004-07-27 09:59:26 +02:00
serg@serg.mylan
b9512a55aa BUG#4717 - check for valid table names in ALTER TABLE ... RENAME 2004-07-26 10:52:40 +02:00
bar@mysql.com
6cad42e3ce Bug #4555 ALTER TABLE crashes mysqld with enum column collated utf8_unicode_ci 2004-07-23 19:10:06 +05:00
pekka@mysql.com
56fa7bfd90 Merge 2004-07-23 13:27:26 +02:00
mskold@mysql.com
217bd8b6bd WL#1791 Handler: support update of primary key 2004-07-22 18:35:51 +02:00
pekka@mysql.com
9c3dd2fb8b ha_ndb blobs 2 2004-07-22 12:38:09 +02:00
pekka@mysql.com
e38792a638 ha_ndb blobs 2004-07-22 12:33:14 +02:00
serg@serg.mylan
849ab31863 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-21 19:17:50 +02:00
serg@serg.mylan
555442bf6a fixed ORDER BY ? 
new tests to ensure that prepared statement *really* work
(and that MySQL not picks up some number from arbitrary location
that happens to match the parameter's value)
 2004-07-21 19:17:07 +02:00
hf@deer.(none)
cbff743b2d Final patch for WL#1600(warn if max_allowed_packet used) 2004-07-21 21:27:45 +05:00
hf@deer.(none)
5bff13bc72 Merging 2004-07-21 19:10:37 +05:00
mskold@mysql.com
42df1f0686 ndb_lock.test, ndb_lock.result: 
new file
 2004-07-21 12:06:46 +02:00
mskold@mysql.com
6082f484a3 Added test for bug#4595 2004-07-20 14:50:22 +02:00
serg@serg.mylan
5f3461838b oops, forgot to checkin... 2004-07-20 11:13:23 +02:00
serg@serg.mylan
9de748d1d3 results fixed after merge 2004-07-20 11:00:10 +02:00
serg@serg.mylan
1f0cd873c5 manual merged (blame me!) 2004-07-20 00:53:24 +02:00
magnus@neptunus.(none)
dd0c7facd0 Added new test/result file ndb_types to test creating tables with different column types in NDB 2004-07-19 11:38:28 +02:00
magnus@neptunus.(none)
e8d0f26a92 BUG#4511 Made Discless deprecated 2004-07-19 10:50:50 +02:00
mskold@mysql.com
ce96f0e407 Removed timeout tests 2004-07-19 10:31:55 +02:00
mskold@mysql.com
cf87b5b096 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-07-19 09:09:40 +02:00
guilhem@mysql.com
e5c2285782 Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT" 
The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).
 2004-07-18 14:34:35 +02:00
guilhem@mysql.com
37bf41a7ae Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-07-17 17:10:52 +02:00
guilhem@mysql.com
88e00cd919 Fixes for 
BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.
 2004-07-17 16:58:16 +02:00
bell@sanja.is.com.ua
f973ac9942 test fix 2004-07-17 02:09:25 +03:00
bell@sanja.is.com.ua
67de5c37ff Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-07-16 15:45:06 +03:00
marko@hundin.mysql.fi
20b60510e9 InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE 
(Bug #4446)
 2004-07-15 15:46:22 +03:00
bell@sanja.is.com.ua
8ab5398bf7 check that all system tables deleted added 2004-07-15 14:17:30 +03:00
mskold@mysql.com
bddd075d73 Fixed bug #4106 and removed buggy pk update 2004-07-09 13:18:56 +02:00
monty@mysql.com
07808113d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-07-09 10:55:47 +03:00
monty@mysql.com
c1032fe9eb Cleanup of db option cacheing 
Some bug fixes to last pushed code
 2004-07-09 10:55:16 +03:00
monty@mysql.com
064b8b8f65 Merge with 4.0 to get bug fixes 2004-07-09 02:29:28 +03:00
monty@mysql.com
93f3d4c020 Updated result sets (from 4.1) 2004-07-09 02:03:19 +03:00
bar@mysql.com
6c996daa91 Bug#4338: mysql-test-run fails if compiled with non-latin1 character set 2004-07-08 18:54:07 +05:00
bell@sanja.is.com.ua
ce5caec189 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-07-08 13:59:53 +03:00
bar@mysql.com
d2076ae8d5 Minor fix: V is primary level, not U. 2004-07-08 15:19:26 +05:00
bell@sanja.is.com.ua
a0ae383cbf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work2-4.1
 2004-07-08 13:18:57 +03:00
bar@mysql.com
a5025f4ca6 WL#807 Optimize loading database options in load_db_opt 
also known as
BUG#2326 Charset of table is determined by charset of db only if "USE db;"
 2004-07-08 15:03:01 +05:00
serg@serg.mylan
206e642588 results fixed 2004-07-08 10:11:30 +02:00