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

16538 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
ca74ce3398 additional 4.0 -> 4.1 merge !! 2004-12-25 00:07:22 +02:00
Sinisa@sinisa.nasamreza.org
f385e79ad4 4.0 -> 4.1 merge 2004-12-24 23:07:10 +02:00
dlenev@mysql.com
71da86aa11 Manual merge of changes making GRANTs, which change SSL attributes and/or 
user limits to behave well on 5.0 tables, into 4.1 tree.
 2004-12-23 22:16:43 +03:00
Sinisa@sinisa.nasamreza.org
d110146252 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-12-23 21:11:31 +02:00
Sinisa@sinisa.nasamreza.org
3c5a325897 Fix for a bug #7495 2004-12-23 21:08:54 +02:00
dlenev@mysql.com
caade862ae Make GRANTs, which change SSL attributes and/or user limits, 
to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now).
 2004-12-23 21:59:36 +03:00
serg@serg.mylan
d38db21048 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-23 17:40:22 +01:00
serg@serg.mylan
7960b09bca incorrect result fixed 2004-12-23 17:32:29 +01:00
wax@mysql.com
91767a1099 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1smemory
 2004-12-23 16:06:30 +05:00
wax@kishkin.ru
4788b15201 fix indentation 
add space after comma
add space after equal
add comments in vio_close_shared_memory()
 2004-12-23 16:04:40 +05:00
bar@mysql.com
b236841890 Take charsets from the source directory rather than 
from the install directory.
 2004-12-23 13:52:25 +04:00
wax@mysql.com
a3e73fc673 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1smemory
 2004-12-23 14:44:21 +05:00
serg@serg.mylan
f0106df58b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-22 23:00:12 +01:00
serg@serg.mylan
9f94a42fcc BitKeeper/triggers/pre-delta 
don't checkin for Administrator or mysqldev
sql/log.cc@1.157
    restored a bugfix that was lost in a merge
 2004-12-22 22:59:19 +01:00
tomas@poseidon.ndb.mysql.com
ed3e1bb006 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-12-22 22:48:31 +01:00
tomas@poseidon.ndb.mysql.com
263832da65 fixed so that last repeats are printed first with correct time if another message comes 
decided for fixed size buffers in LogHandler repeated messages
 2004-12-22 22:47:56 +01:00
Sinisa@sinisa.nasamreza.org
e409ebf143 A fix for the bug #7495 2004-12-22 21:31:17 +02:00
tomas@poseidon.ndb.mysql.com
e9c0a17cf2 added handling of repeated messages 2004-12-22 18:27:07 +01:00
dlenev@mysql.com
beb2c1d909 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-smfix
 2004-12-22 19:00:03 +03:00
dlenev@brandersnatch.localdomain
7b9fd879f6 Fix for bug #7458 "Microseconds are gobbled from the string result of 
STR_TO_DATE() function if there is another format specifier after %f 
in format string". Also small cleanup of STR_TO_DATE() implementation.
(After review version.)
 2004-12-22 18:58:25 +03:00
tomas@poseidon.ndb.mysql.com
99622f3fa1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-12-22 16:30:16 +01:00
tomas@poseidon.ndb.mysql.com
09dccee098 changed name of g_eventLogger so it can be used in TransporterRegistry and is the same as in the kernel 2004-12-22 16:29:01 +01:00
bar@mysql.com
78260fc1c8 Bugs#7278: Don't open a table if it contains columns with non-supported charsets 2004-12-22 18:56:57 +04:00
pekka@mysql.com
c104fe598e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-12-22 15:08:23 +01:00
pekka@mysql.com
542820d3f8 ndb: use Ndb_cluster_connection in test* 2004-12-22 15:08:22 +01:00
joreland@mysql.com
f22b3a75e8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-22 14:59:27 +01:00
joreland@mysql.com
8aa60fdd01 ndb - Fix bug in backward compatility code (for our test programs) 2004-12-22 14:58:57 +01:00
pekka@mysql.com
60b79f2b7e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-12-22 13:38:16 +01:00
pekka@mysql.com
f57153fe81 ndb: bug#7340 fix 2004-12-22 13:38:15 +01:00
bar@mysql.com
e53b446a73 Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8 
See mysqldump.test comments for more details
 2004-12-22 16:02:27 +04:00
heikki@hundin.mysql.fi
64f36c94d1 ha_innodb.cc: 
Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.
 2004-12-22 11:11:16 +02:00
heikki@hundin.mysql.fi
73f61e9d15 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2004-12-22 11:09:09 +02:00
joreland@mysql.com
193310c884 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-22 10:09:08 +01:00
joreland@mysql.com
13916aa8dd wl1292 - ndb autotest - adapt to changes in Logger 2004-12-22 10:01:31 +01:00
heikki@hundin.mysql.fi
917e8b4da3 ha_innodb.cc: 
If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
 2004-12-22 11:01:25 +02:00
tomas@poseidon.ndb.mysql.com
e28ad14429 added some debug printouts 2004-12-22 07:50:44 +01:00
tomas@poseidon.ndb.mysql.com
890a97c7cd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-12-22 07:23:21 +01:00
tomas@poseidon.ndb.mysql.com
78ce178559 added configuration hostnames to SHM config struct 
use configured hostnames for SHM transporter setup
 2004-12-22 07:20:01 +01:00
heikki@hundin.mysql.fi
f1fe6e1784 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2004-12-21 19:33:43 +02:00
tomas@poseidon.ndb.mysql.com
8f2579c6db main.cpp: 
ifdef on version prior to 5.0
 2004-12-21 18:33:41 +01:00
heikki@hundin.mysql.fi
b56085a87e os0file.c: 
Put back accidentally removed undef and remove a debug def
 2004-12-21 18:33:53 +02:00
heikki@hundin.mysql.fi
e25b633367 os0file.c: 
Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform
 2004-12-21 18:21:17 +02:00
tomas@poseidon.ndb.mysql.com
424484830f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-12-21 15:58:18 +01:00
tomas@poseidon.ndb.mysql.com
6c9dcae992 NdbApi.hpp: 
NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp
 2004-12-21 15:57:36 +01:00
bar@mysql.com
57ec14d939 Bug#7302: UCS2 data in ENUM field get truncated when new column is added 2004-12-21 17:12:27 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
ecd85b1836 Bug#6481 - storage_engine system variable allows nonsensical value 
Check that the requested storage engine is enabled.
 2004-12-21 11:09:48 +00:00
tomas@poseidon.ndb.mysql.com
af74a32186 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-12-21 11:39:22 +01:00
tomas@poseidon.ndb.mysql.com
490f2fbab1 added ndb_init.h to distribution 
added missing copyright text
    moved ndb_init things to separate header file
    removed ndb_global include
    documented cluster connection class
    moved internal constants to NdbImpl.hpp class
    changed wait_until_ready behaviour somewhat
 2004-12-21 10:37:12 +01:00
hf@deer.(none)
514e5a2c50 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-12-21 12:33:17 +04:00
hf@deer.(none)
72dd42bee6 Tabs removed 2004-12-21 12:31:38 +04:00