mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18713 commits 2784 branches 343 tags 1.6 GiB
Commit graph

18713 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
365711af17 A patch for Netware. 2005-01-13 19:24:54 +02:00
unknown
21dce62534 manual merge 2005-01-13 18:15:58 +03:00
unknown
9c4824af7c manual merge 
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
 2005-01-13 17:31:49 +03:00
unknown
9842aca3ef bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
unknown
9d983c4550 - keep 5.0.3-alpha version string (after-merge fix) 2005-01-13 15:10:12 +01:00
unknown
4c84421bdf - bumped up the version number in configure.in from 4.1.9 to 4.1.10 
- tagged ChangeSet 1.2207 as "mysql-4.1.9"


configure.in:
  - bumped up the version number from 4.1.9 to 4.1.10
 2005-01-13 14:57:51 +01:00
unknown
60ff25cac8 - added the 4.1 shared client libraries to the 5.0 shared-compat RPM 
(we should consider dropping 3.23 from this one soon)
 2005-01-13 14:54:18 +01:00
unknown
3a39e32916 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-5.0-build
 2005-01-13 14:54:17 +01:00
unknown
ef961141ed Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0
 2005-01-13 16:54:16 +03:00
unknown
b75cabff35 The function should exit from loop on invalid byte sequence 2005-01-13 16:53:10 +03:00
unknown
bcb3783c7c 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
unknown
81a082075f - added the 4.0 shared mysqlclient libraries to the 4.1 "shared-compat" RPM 2005-01-13 13:07:35 +01:00
unknown
ee85947744 - added option "--with-federated" to Do-compile to enable building of the 
Federated Storage Engine (as requested by Brian)
- added the federated storage engine to the Max Linux RPM


Build-tools/Do-compile:
  - added option "--with-federated" to enable building of the Federated
    Storage Engine (as requested by Brian)
support-files/mysql.spec.sh:
  - enabled the federated storage engine for the Max RPM subpackage
 2005-01-13 12:03:12 +01:00
unknown
9edcc56cc8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-13 11:34:12 +01:00
unknown
3eb2e7c8d2 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


scripts/mysqlaccess.sh:
  Auto merged
 2005-01-13 11:12:00 +01:00
unknown
7d095a37b9 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
 2005-01-13 10:35:05 +01:00
unknown
f7e9170f07 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-13 10:33:07 +01:00
unknown
a2e905a5b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-13 10:29:03 +01:00
unknown
fee822e41f bug#7864 - fix ndb limit 4.5G data memory due to truncation error 
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove 8k->32k conversion
ndb/src/kernel/vm/Configuration.cpp:
  compute size in 32k pages directly
 2005-01-13 10:28:26 +01:00
unknown
d7c88110f1 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb


sql/sql_analyse.cc:
  Auto merged
 2005-01-13 09:02:20 +01:00
unknown
112325c402 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-13 08:41:42 +01:00
unknown
e0c95d1b97 ndb - take booked scan frags into account when getting scan_fragconf 
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  take booked fragments into account before starting a new frag scan
 2005-01-13 08:40:32 +01:00
unknown
46f5c1f1a3 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1 
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
 2005-01-12 21:09:07 -06:00
unknown
8191a28b97 libmysqld.def, libmysql.def: 
Use the invisible tabs (!)


libmysql/libmysql.def:
  Use the invisible tabs (!)
libmysqld/libmysqld.def:
  Use the invisible tabs (!)
 2005-01-12 21:04:31 -06:00
unknown
bfe5421773 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
unknown
c73762dbdf 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.


sql/mysqld.cc:
  Reorder options.
sql/set_var.cc:
  Reorder variables.
sql/share/errmsg.txt:
  Reword error messages.
mysql-test/r/user_limits.result:
  Fix test result affected by error message rewording.
 2005-01-12 20:38:05 -06:00
unknown
f7f077be82 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1 
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
 2005-01-12 19:58:49 -06:00
unknown
c26f341bb9 libmysqld.def, libmysql.def: 
Add missing 'get_defaults_files' to fix linking error.


libmysql/libmysql.def:
  Add missing 'get_defaults_files' to fix linking error.
libmysqld/libmysqld.def:
  Add missing 'get_defaults_files' to fix linking error.
 2005-01-12 19:56:49 -06:00
unknown
3000bec157 Manual merge. 
sql/sql_analyse.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2005-01-13 02:19:35 +03:00
unknown
069d260b0e Add logging of COM_EXECUTE in the general query log. 
sql/sql_parse.cc:
  A shorter name for COM_EXECUTE command.
 2005-01-13 02:13:19 +03:00
unknown
f247a0d515 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-01-12 23:31:31 +01:00
unknown
4bdf479da0 Symlink vulnerability fixed. 
reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit)
 2005-01-12 23:30:54 +01:00
unknown
e4b6c25cef Merge bk-internal:/home/bk/mysql-5.0-ndb 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-12 22:16:30 +01:00
unknown
d6cb2dbe5b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/test/src/HugoTransactions.cpp:
  Auto merged
 2005-01-12 22:16:29 +01:00
unknown
54ccf5d16c added som signal printout functions 
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
    not necessarily the same starts and stops...
    +error corrected in ref signal
    added print of error codes + more correct error handling of event errors
    + added goto instead of erroneous break to fix bug#7627


ndb/include/kernel/signaldata/SignalData.hpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
  search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
  not necessarily the same starts and stops...
  +error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  indentation
  event error handling
  debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  debug printouts
  + added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
  added print of error codes + more correct error handling of event errors
 2005-01-12 22:09:43 +01:00
unknown
ec459b583b Minor clean up. 
mysql-test/t/analyse.test:
  Added a note about the bug that this test case tests.
sql/sql_analyse.cc:
  Changed function description to standard format.
 2005-01-12 22:55:10 +02:00
unknown
901321b893 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged
 2005-01-12 14:53:11 -06:00
unknown
f34fee6dd5 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
unknown
4596579c99 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2


sql/opt_range.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
 2005-01-12 23:22:12 +03:00
unknown
4c9d5f80c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0
 2005-01-12 21:22:11 +01:00
unknown
138fe1a7b2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged
 2005-01-12 14:17:56 -06:00
unknown
c846af9ba2 Merge 
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  resolve conflicts
 2005-01-12 21:03:06 +01:00
unknown
75b140b975 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
 2005-01-12 21:01:15 +01:00
unknown
ca1ac0c53b Merge build.mysql.com:/users/tulin/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-5.0
 2005-01-12 20:58:07 +01:00
unknown
8f61caea0a 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


sql/mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
sql/set_var.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/t/innodb.test:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/r/innodb.result:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2005-01-12 20:55:06 +01:00
unknown
fd7e0d847b manual merge 
sql/mysqld.cc:
  Auto merged
 2005-01-12 21:51:04 +03:00
unknown
e123c2a1b9 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 12:42:53 -06:00
unknown
a1392a321b Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 19:19:55 +01:00
unknown
3719265be7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-4.1
 2005-01-12 19:00:33 +01:00
unknown
a3d3aef157 A test case for Bug#6761 "mysql_list_fields doesn't work" 2005-01-12 20:28:31 +03:00