database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity
19,029 Commits 3,153 Branches 363 Tags
b3a6628599c4c4762d48d35aabeaa171229d20d0
Commit Graph

5320 Commits

Author SHA1 Message Date
konstantin@mysql.com
019ff4c577 Manual merge. 2005-01-13 02:19:35 +03:00
guilhem@mysql.com
4c105693d7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-12 22:23:00 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3e3e140e3d Minor clean up. 2005-01-12 22:55:10 +02:00
tulin@build.mysql.com
7cc1926b0c Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-12 21:25:16 +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
tulin@build.mysql.com
2c174baf8a Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-12 21:01:15 +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
konstantin@mysql.com
f01f721672 manual merge 2005-01-12 21:51:04 +03: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
joreland@mysql.com
1d2d545000 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-12 11:25:54 +01:00
joreland@mysql.com
953df8f48d Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-12 11:24:46 +01: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
2c6ef57f9a uncommented the drop table statement 2005-01-11 20:26:43 -08: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
tomas@poseidon.ndb.mysql.com
a5c08a718e ndbcluster.sh: 
increased timeouts to see if more tests get started automatically
 2005-01-11 23:09:10 +01:00
kent@mysql.com
70443afe7d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-11 21:09:22 +01: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
joreland@mysql.com
cc051b0d33 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-11 17:14:02 +01: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
tomas@poseidon.ndb.mysql.com
cecb618c62 bug fixed parsing with comments on same line 2005-01-11 16:00:11 +01:00
joreland@mysql.com
fd9d32bd7e Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-11 15:46:43 +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
joreland@mysql.com
9ab13311c9 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-11 11:16:02 +01:00
kent@mysql.com
654c95dcba Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-11 01:36:49 +01:00
kent@mysql.com
31d5463ae1 mtr_process.pl: 
Catch more fork() errors.
  Moved sleep_until_file_created() here from "mysql-test-run.pl".
  Improved debug output.
mtr_io.pl:
  Improved mtr_get_opts_from_file(), try to mimic some sh.
mysql-test-run.pl:
  Cleaned up the timeout handling.
  Created new function environment_setup().
  Corrected time zone handling.
  Moved sleep_until_file_created() to "lib/mtr_process.pl".
  Improved debug output.
 2005-01-11 01:35:08 +01: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
tomas@poseidon.ndb.mysql.com
d7a066ab05 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-10 01:35:18 +01:00