database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Code Activity
13,746 Commits 3,280 Branches 1,098 Tags
3fdc2999b78b997aa149d9292d7d55d29c95f0f1
Commit Graph

3529 Commits

Author SHA1 Message Date
joreland@mysql.com
3fdc2999b7 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-12 20:31:00 +02:00
bar@mysql.com
eb1a82b25d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-08-12 20:43:14 +05:00
bar@mysql.com
fad7a5643a #4521: unique key prefix interacts poorly with utf8 
Fix for MyISAM with prefix compressed keys.
 2004-08-12 20:39:24 +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
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
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
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
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
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
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
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