1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-12 08:01:43 +03:00
Commit Graph

7033 Commits

Author SHA1 Message Date
jimw@mysql.com
a66f6b79be Merge mysql.com:/home/jimw/my/mysql-5.0-6659
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-14 10:47:21 -08:00
joerg@mysql.com
790ea71b60 Re-enable running the 'client_test' test case during release builds on the platforms (bug#7909). 2005-01-14 18:57:50 +01:00
tomas@poseidon.ndb.mysql.com
843ef4fcc8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-14 14:30:30 +01:00
guilhem@mysql.com
5cafbb6838 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 14:23:34 +01:00
tomas@poseidon.ndb.mysql.com
fa57a72b9b added support for 'show status like 'Ndb%''
added number_of_replicas printout in show table status
2005-01-14 12:32:33 +01:00
bar@mysql.com
71fe5f7e17 Bug#7284: strnxfrm generates different results for equal strings
additional fix for cp932 and eucjpms, recently implemented by
Shuichi.
2005-01-14 14:16:56 +04:00
guilhem@mysql.com
980d1b658e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 10:59:37 +01:00
joreland@mysql.com
0dc477c58b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-14 09:06:22 +01:00
dlenev@mysql.com
8be6787640 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-14 10:09:01 +03:00
jimw@mysql.com
25fde2d092 In TRADITIONAL mode, don't allow a NOT NULL field with no default be set to
DEFAULT (with no argument) or to the field's type's default by not being
listed in the list of fields being inserted. (Bug #5986)
2005-01-13 18:23:34 -08:00
jimw@mysql.com
3998da80e9 Output 'MEMORY' as table type for tables using the memory (nee heap) storage
engine, except when running with sql_mode & MYSQL323. (Bug #6659)
2005-01-13 17:38:13 -08:00
monty@mysql.com
2204baa5a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-14 00:10:03 +02:00
jimw@mysql.com
444c831e6e Update results files 2005-01-13 13:46:59 -08:00
monty@mysql.com
7c457a1bd7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-13 20:09:41 +02:00
tomas@poseidon.ndb.mysql.com
77af3703b2 adopted to changed show table status output 2005-01-13 19:00:04 +01:00
jimw@mysql.com
80c56602d3 Merge 2005-01-13 09:31:54 -08:00
jimw@mysql.com
7e1f47022c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:24:07 -08:00
jimw@mysql.com
d63dc891c1 Add test cases to verify that SHOW CREATE TABLE always outputs the
key algorithm for keys where they were explicitly specified.
2005-01-13 18:22:35 +01:00
jimw@mysql.com
28ee2a67b3 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 09:09:10 -08:00
jimw@mysql.com
7639e5afaf Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:21 -08:00
konstantin@mysql.com
443cafc232 manual merge 2005-01-13 18:15:58 +03:00
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
mskold@mysql.com
290489e657 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-13 10:49:01 +01:00
joreland@mysql.com
ca8a6d85ad ndb - make sure to drop table at end ndb_update 2005-01-13 09:22:00 +01:00
tulin@build.mysql.com
5372254767 Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-13 09:02:20 +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
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