mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-06 03:03:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20069 commits 2861 branches 349 tags 1.7 GiB
Commit graph

20069 commits

Author SHA1 Message Date
jani@a193-229-222-105.elisa-laajakaista.fi
16ed1ce5cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
 2005-11-29 11:52:43 +02:00
gluh@mysql.com
572e338fa8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Merge/4.1
 2005-11-29 13:07:56 +04:00
gluh@eagle.intranet.mysql.r18.ru
4b6a94ffb4 Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a 
added SSL_library_init()
 2005-11-29 12:15:48 +04:00
stewart@mysql.com
c9dc609d21 DbdihMain.cpp: 
management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.
 2005-11-29 08:42:36 +01:00
bar@mysql.com
5c1ba75cfd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b10446
 2005-11-29 09:21:57 +04:00
knielsen@mysql.com
f0c5aae500 Merge mysqldev@production:my/mysql-4.1.16-fixes 
into  mysql.com:/usr/local/mysql/mysql-4.1
 2005-11-28 16:35:28 +01:00
knielsen@mysql.com
9248dfc840 Minor Win32 compile fixes for 4.1.16 release. 2005-11-28 15:07:20 +01:00
bar@mysql.com
2b18be14ca Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 17:16:39 +04:00
bar@mysql.com
63b038f2e6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 12:45:40 +04:00
kent@mysql.com
114cf11218 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-28 09:44:47 +01:00
serg@serg.mylan
c246aa1635 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-11-26 20:50:22 +01:00
serg@serg.mylan
701de9be0a followup for for the bug#5686 2005-11-26 19:36:11 +01:00
konstantin@mysql.com
f57dffe453 A fix and a test case for Bug#14410 "Crash in Enum or Set type in 
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.
 2005-11-25 13:25:31 +03:00
mskold@mysql.com
6d5ef98adc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-25 10:56:01 +01:00
mskold@mysql.com
c2acc2da99 Updated expected error 2005-11-25 10:41:22 +01:00
evgen@moonbone.local
e3cab037bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14482-bug-4.1-mysql
 2005-11-24 19:17:31 +03:00
evgen@moonbone.local
a4a3215a44 Fix bug Wrongly applied optimization in resolve_const_item() caused 
crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.
 2005-11-24 19:16:51 +03:00
mskold@mysql.com
f27dc1c232 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-24 16:21:49 +01:00
mskold@mysql.com
70d447c1f1 Moved check of wrong schema version earlier 2005-11-24 16:21:07 +01:00
joerg@mysql.com
205c6fc1e9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-11-23 09:38:12 +01:00
jonas@perch.ndb.mysql.com
7e5130c084 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-11-23 07:53:04 +01:00
joerg@mysql.com
c735d07dec support-files/mysql.spec.sh 
Fix a possible problem on RPM un-install. bug#15145
 2005-11-22 19:58:58 +01:00
bell@sanja.is.com.ua
471f9ca364 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
 2005-11-22 10:55:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8ad3b9961b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
 2005-11-22 10:35:34 +02:00
kent@mysql.com
1483379b4c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-22 01:47:15 +01:00
bar@mysql.com
2f72e05903 Bug#10446 Illegal mix of collations: 
item_strfunc.h, item_strfunc.cc, item.cc:
  Try to convert a const item into destination 
  character set. If conversion happens without
  data loss, then cache the converted value
  and return it during val_str().
  Otherwise, if conversion loses data, return
  Illeral mix of collations error, as it happened
  previously.
ctype_recoding.result, ctype_recoding.test:
  Fixing tests accordingly.
 2005-11-21 17:26:31 +04:00
msvensson@neptunus.(none)
c9e0aab7b6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-11-21 13:42:36 +01:00
gluh@eagle.intranet.mysql.r18.ru
f0f8b9c658 Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled 2005-11-21 16:09:26 +04:00
msvensson@neptunus.(none)
e6331657a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-11-21 12:28:36 +01:00
msvensson@neptunus.(none)
9301123eb3 Bug Creating table with packed key fails silently 
- Backport from 5.0
 2005-11-21 12:27:58 +01:00
mskold@mysql.com
efdef780bc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-21 08:42:36 +01:00
kent@mysql.com
133c00beb4 configure.in: 
Corrected "include/readline" link for "make distcheck"
 2005-11-19 12:58:22 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
mskold@mysql.com
16fcccce1a Disabled --ps-protocol during autodiscover test 2005-11-18 12:20:22 +01:00
mskold@mysql.com
2237d9b745 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-18 10:14:27 +01:00
jimw@mysql.com
e21566e908 Merge mysql.com:/home/jimw/my/mysql-4.1-14801 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 11:44:15 -08:00
jimw@mysql.com
c1261f588f Merge mysql.com:/home/jimw/my/mysql-4.1-12640 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 10:59:21 -08:00
jimw@mysql.com
cee6671756 Merge mysql.com:/home/jimw/my/mysql-4.1-11796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 10:58:46 -08:00
ingo@production.mysql.com
a7daeaf64f Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1
 2005-11-17 13:44:34 +01:00
mskold@mysql.com
77cbf5d3ff Fixed incorrectly use if table with wrong schema version 2005-11-17 12:45:23 +01:00
sasha@asksasha.com
0b275de13f Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-16 21:18:13 -07:00
sasha@asksasha.com
eac88b685c fixed the race condition in the test case for BUG#7947 2005-11-16 21:17:38 -07:00
ingo@mysql.com
1237c2fbcc Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-16 21:33:38 +01:00
pekka@mysql.com
a6e410dd4e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1
 2005-11-16 13:28:54 +01:00
pekka@mysql.com
a8ce4d27ce ndb - bug#14007 4.1 [re-commit for LenZ merge] 2005-11-16 11:52:09 +01:00
stewart@mysql.com
87e98c8706 WL#2779 ndb_size.pl 
Add display of minimum requirements for various cluster parameters
e.g. DataMemory, IndexMemory, MaxNoOfTables, MaxNoOfAttributes etc

and the memory usage because of them.
 2005-11-16 19:47:03 +11:00
stewart@mysql.com
d9ef452289 WL#2779 ndb_size.pl 
fix some small bugs, slightly improve output, add --help
 2005-11-16 18:26:30 +11:00
sasha@asksasha.com
cb6d69f6f4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-15 13:38:48 -07:00
sasha@asksasha.com
9986a357ec merged in the test case for BUG#7947 2005-11-15 13:38:06 -07:00
ingo@mysql.com
6bc4636b64 Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 18:09:40 +01:00