mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19302 commits 2790 branches 343 tags 1.7 GiB
Commit graph

4578 commits

Author SHA1 Message Date
guilhem@mysql.com
a02601ecc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-13 15:35:36 +01:00
konstantin@mysql.com
a676498977 manual merge 2005-01-13 17:31:49 +03:00
bar@mysql.com
e3d6e6736b bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
jani@ua141d10.elisa.omakaista.fi
9cea2457ec Fixed a problem with a test. Time could be 0 or 1 seconds, depending 
on whether running with or without valgrind.
 2005-01-13 15:04:57 +02:00
dlenev@mysql.com
52baee6346 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-13 14:46:41 +03:00
joreland@mysql.com
19ef719912 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-13 11:35:12 +01:00
joreland@mysql.com
ca8a6d85ad ndb - make sure to drop table at end ndb_update 2005-01-13 09:22:00 +01:00
paul@kite-hub.kitebird.com
969b8ca5c4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 20:39:04 -06:00
paul@kite-hub.kitebird.com
231632e34f user_limits.result: 
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.
 2005-01-12 20:38:05 -06:00
jimw@mysql.com
51781b0bfc Fix conversion of floating point values to character fields when the 
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)
 2005-01-13 00:41:45 +01:00
sergefp@mysql.com
106509992e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
 2005-01-12 23:22:12 +03:00
vtkachenko@mail.mysql.com
306df48731 Merge 2005-01-12 21:03:06 +01:00
vtkachenko@mail.mysql.com
9f640bbad9 logging_ok: 
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
 2005-01-12 20:55:06 +01:00
guilhem@mysql.com
44ce4b43ef Fix for BUG#7793 "mysqlbinlog produces incorrect queries": 
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
 2005-01-12 19:42:46 +01:00
jimw@mysql.com
0b041fe2e1 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 18:09:44 +01:00
jimw@mysql.com
fd7d355fbd Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 17:05:33 +01:00
monty@mysql.com
073a8881ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-12 16:02:46 +02:00
shuichi@mysql.com
852d74a68e renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
monty@mysql.com
11c63eae01 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-12 11:45:04 +02:00
dlenev@brandersnatch.localdomain
23c9e0a75a Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly". 2005-01-12 12:18:36 +03:00
sergefp@mysql.com
fda91bee40 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
 2005-01-12 09:05:11 +03:00
shuichi@mysql.com
3126e82291 added new character set - cp932, eucjp_ms 2005-01-11 17:45:36 -08:00
monty@mysql.com
aad3d64a6f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-01-12 03:40:02 +02:00
monty@mysql.com
314cf993c6 Fixed memory reference errors found by valgrind 2005-01-12 03:38:53 +02:00
bar@mysql.com
28ee79a732 strict.result, strict.test: 
Clean-up for the previous change: VARCHAR and trailing spaces.
 2005-01-11 23:28:57 +04:00
hf@deer.(none)
38baa28a10 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-01-11 22:15:29 +04:00
jani@ua141d10.elisa.omakaista.fi
fd79354273 Fixed Bug#2813, "analyse does not quot string values in enams from string". 2005-01-11 19:40:33 +02:00
monty@mysql.com
f4274fe9be Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-11 19:35:00 +02:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
bar@mysql.com
2bd854c859 Bug #7730 Server crash using soundex on an utf8 table 
Don't use my_tolower: it works only for 8bit charsets.
 2005-01-11 19:58:53 +04:00
mskold@mysql.com
718d4ea245 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-11 16:49:52 +01:00
mskold@mysql.com
082bd01572 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-11 14:21:58 +01:00
joreland@mysql.com
ee72592bfd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-11 13:56:06 +01:00
joreland@mysql.com
d4aea9a44b Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-11 13:50:28 +01:00
bar@mysql.com
691b3283d2 If VARCHAR strips only trailing spaces, then produce 
a note, not a warning or error.
 2005-01-11 16:49:45 +04:00
joreland@mysql.com
6c69e3d2b3 bug#7798 - ndb - range scan with invalid table version could cause node failure 2005-01-11 13:30:11 +01:00
dlenev@brandersnatch.localdomain
2f32115092 Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDB 
mode".

Changed grammar rule for "type" token. Now we have one branch with 
optional length specification for TIMESTAMP type instead of two separate
branches.
 2005-01-11 14:26:40 +03:00
mskold@mysql.com
fb5e3b7245 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-10 23:27:37 +01:00
mskold@mysql.com
fa2fd91a09 Recorded new result file 2005-01-10 21:45:35 +01:00
guilhem@mysql.com
b5a44aebbd Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-10 15:15:49 +01:00
guilhem@mysql.com
b9926d71c0 A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE). 2005-01-10 15:13:33 +01:00
monty@mysql.com
56fb6f31ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-10 15:28:17 +02:00
joreland@mysql.com
b4c251134f Merge mysql.com:/home/jonas/src/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-09 11:01:47 +01:00
joreland@mysql.com
7b0748ed9a ndb - 
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets
 2005-01-09 11:00:37 +01:00
pekka@mysql.com
51adbae299 Merge 2005-01-09 00:45:06 +01:00
jimw@mysql.com
442fae37c5 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-08 23:32:53 +01:00
jimw@mysql.com
61f189a09b Update test as result of merge 2005-01-08 23:32:28 +01:00
pekka@mysql.com
195f7bda02 Merge 2005-01-08 22:34:16 +01:00
jimw@mysql.com
e959e0b8fc Merge mysql.com:/home/jwinstead2/mysql-4.1-7233 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-08 22:22:41 +01:00
pekka@mysql.com
50c3a883b2 ndb - wl-1442 fix Time ordering 2005-01-08 19:28:44 +01:00