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

13999 commits

This branch
This branch
All branches
Author SHA1 Message Date
joreland@mysql.com
c7f311c450 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 20:58:55 +02:00
bar@mysql.com
7a27f2ce8c Bug#4594 "column index make = failed for gbk, but like works" 
Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
 2004-08-20 21:29:36 +05:00
joreland@mysql.com
ae522cc19c Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 18:29:36 +02:00
tomas@poseidon.(none)
64fc12f3d2 compile error fixes for some platforms 2004-08-20 16:29:35 +00:00
dlenev@brandersnatch.localdomain
8bea792b14 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
 2004-08-20 20:04:49 +04:00
tomas@poseidon.(none)
d9b266d2da Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 16:04:48 +00:00
tomas@poseidon.(none)
b4c8431c18 fix compile error on some platforms 2004-08-20 16:04:06 +00:00
dlenev@brandersnatch.localdomain
b4105df897 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
 2004-08-20 19:30:45 +04:00
lenz@mysql.com
bc8228b6fc Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-08-20 17:30:45 +02:00
tomas@poseidon.(none)
a71f1894d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 15:30:44 +00:00
tomas@poseidon.(none)
90fde3f48d small helptext fix 2004-08-20 15:29:54 +00:00
joreland@mysql.com
f02ebd6fcc bug#5128 - remove need of unique fs-path 
bug#4761 - more validation of hosts
bug#4511 - only non depricated should be saved in config
         - fix ConfigInfo::BOOL w.r.t deprication
 2004-08-20 15:58:30 +02:00
dlenev@brandersnatch.localdomain
c8882165f3 Fix for bug#4302 "ambiguos order by when renamed column is identical to another in result" 
When in find_item_in_list() we are looking for item we should take into account unaliased 
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.
 2004-08-20 17:53:46 +04:00
lenz@mysql.com
fd25d80e9e - do not link statically on our IA64 and AMD64 build hosts, as 
static linking against an unpatched glibc 2.3 is causing trouble
 - add "glibc23" to the release suffix in this case
 - re-ordered the Changelog that was messed up by a BK merge
   (RPM is picky about this)
 2004-08-20 15:52:16 +02:00
mronstrom@mysql.com
2f859587b8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/mikron/mysql-4.1
 2004-08-20 14:47:41 +02:00
mronstrom@mysql.com
4234a57f3f Compile fixes for Mac OS X 2004-08-20 14:43:23 +02:00
pem@mysql.com
6c84b4e237 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2004-08-20 14:04:30 +02:00
mskold@mysql.com
b4357f8381 Bugfix for bug#5072, removed table version in BLOB table name since this is incremented at alter table 2004-08-20 14:04:29 +02:00
pem@mysql.com
ed4f183b68 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2004-08-20 13:25:48 +02:00
hf@deer.(none)
833baf6f9c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-20 16:25:47 +05:00
tomas@poseidon.(none)
4ec4e2662b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-clean
 2004-08-20 11:25:46 +00:00
tomas@poseidon.(none)
b2af364f71 fixed some help tests for ndb executables 2004-08-20 11:24:41 +00:00
pem@mysql.comhem.se
ccad8307ba Fixed compiler warnings in sql/field.h. 2004-08-20 13:11:14 +02:00
hf@deer.(none)
ce65325320 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-08-20 15:39:26 +05:00
tomas@poseidon.(none)
f3a3399e58 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 10:39:25 +00:00
gluh@gluh.mysql.r18.ru
71a4f92cdc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
 2004-08-20 13:39:00 +04:00
hf@deer.(none)
833d285c67 Fix to make range.test work smoothly --without-innidb 2004-08-20 14:29:28 +05:00
gluh@gluh.mysql.r18.ru
83f78fd5d5 Resolving merging conflict 2004-08-20 12:33:52 +04:00
mskold@mysql.com
6a054ce26e Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-20 09:00:13 +02:00
hf@deer.(none)
0bda11b695 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-20 10:50:23 +05:00
mskold@mysql.com
a3c99571a7 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-20 06:53:23 +02:00
mskold@mysql.com
6f8ebb4798 Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-20 06:51:02 +02:00
serg@serg.mylan
43826f0974 merged 2004-08-20 01:38:20 +02:00
serg@serg.mylan
4f57cee99f typo in libedit fixed - possible buffer overflow - bug#4696 2004-08-20 01:34:34 +02:00
serg@serg.mylan
62722e7b05 merged 2004-08-20 00:52:43 +02:00
guilhem@mysql.com
54d43b7b19 sql_class.h: 
removing unneeded var left from 4.0
 2004-08-20 00:01:00 +02:00
serg@serg.mylan
22546845f2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-19 23:45:44 +02:00
guilhem@mysql.com
0db5b4d202 (manual port from 4.0 - was needed) 
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
 2004-08-19 23:24:35 +02:00
serg@serg.mylan
068a57b12c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-08-19 23:11:16 +02:00
serg@serg.mylan
b81af1c750 less strict assert to take into account weird cases 2004-08-19 23:10:33 +02:00
marko@hundin.mysql.fi
1773e759e4 ha_innodb.cc: 
innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()
 2004-08-19 23:22:16 +03:00
ingo@mysql.com
ad7f0fa51e Build bug on 64-Bit platforms. 
Removed improper casts.
Thanks to Joerg Bruehe for the fix.
 2004-08-19 21:41:10 +02:00
mskold@mysql.com
ba924c0a40 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-19 21:37:58 +02:00
pem@mysql.comhem.se
2d7f4c30a7 Fixed symbol name problems that made build fail. 2004-08-19 20:48:00 +02:00
serg@serg.mylan
68bc1c28a4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-19 18:42:01 +02:00
serg@serg.mylan
a29c9d3707 Bug #4769 - ft in subqueries 2004-08-19 18:40:15 +02:00
hf@deer.(none)
eec860fd7f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-19 21:25:37 +05:00
tomas@poseidon.(none)
70bca251cb fixes for some compile problems on some platforms 2004-08-19 15:01:44 +00:00
tomas@poseidon.(none)
1ec6cb1c8a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-19 14:30:02 +00:00
guilhem@mysql.com
22a65bcf26 mysql_com.h: 
still better names for enum; removing unneeded symbol
 2004-08-19 15:15:52 +02:00