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
26697 commits 2791 branches 343 tags 1.7 GiB
Commit graph

26697 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars@mysql.com
835a24cb13 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-09-29 12:34:03 +02:00
marko@hundin.mysql.fi
d426c109f4 Minor corrections to InnoDB function comments 2005-09-29 12:37:27 +03:00
lars@mysql.com
d81d57d408 mysqlbinlog --hexdump augments each log entry with byte information 2005-09-29 10:42:23 +02:00
stewart@mysql.com
5e70387fb8 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-09-29 12:46:46 +10:00
brian@zim.(none)
db486f4da1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/archive-move
 2005-09-28 19:07:43 -07:00
brian@zim.(none)
da101b3b5a Moving archive from example to sql. 2005-09-28 19:04:51 -07:00
stewart@mysql.com
45f667cd85 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-09-29 11:38:38 +10:00
kent@mysql.com
656b0cc15a Merge 2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d Many files: 
Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h
 2005-09-29 02:08:24 +02:00
kent@mysql.com
7e6a78a1ae mtr_process.pl: 
Append to some of the log files, not overwrite
 2005-09-28 23:53:31 +02:00
kent@mysql.com
7d33bdeffa mysql-test-run.pl: 
Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.
 2005-09-28 23:52:10 +02:00
kent@mysql.com
fdeceae81f mysql-test-run.pl: 
Pass on all --skip-* to mysqld
 2005-09-28 23:24:44 +02:00
lenz@mysql.com
6e10a589e1 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-28 23:05:42 +02:00
lenz@mysql.com
972d85af8b - compile fix: don't use C++ - style comments in .c files! 2005-09-28 23:04:35 +02:00
pekka@mysql.com
7c98b74d2c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2005-09-28 19:57:08 +02:00
pekka@mysql.com
1f09229316 ndb - printSchemaFile: more checks and options 2005-09-28 19:54:55 +02:00
evgen@moonbone.local
1bf2fbdb35 select.result, item.cc: 
After merge fix for bug#13356
 2005-09-28 21:30:10 +04:00
msvensson@neptunus.(none)
8ccd9e37ad Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 18:23:23 +02:00
patg@krsna.patg.net
3d5c6ea98a BUG #13511 Wrong patch pushed, fixing. 2005-09-28 08:04:08 -07:00
dlenev@mysql.com
ca7a945dc9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13546
 2005-09-28 18:46:01 +04:00
dlenev@mysql.com
6f7928c293 Fix for bug #13546 "Build errors with --with-embedded-server 
--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..."
 2005-09-28 18:43:46 +04:00
msvensson@neptunus.(none)
13161c2a84 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 15:32:05 +02:00
stewart@mysql.com
b738727fc1 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-09-28 23:14:12 +10:00
jonas@perch.ndb.mysql.com
a11dcd74d2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-28 14:42:01 +02:00
dlenev@mysql.com
dc50fc2403 Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-09-28 15:59:55 +04:00
jonas@perch.ndb.mysql.com
2dc334ac0f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-28 13:54:12 +02:00
msvensson@neptunus.(none)
324f4be3d4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-09-28 13:45:42 +02:00
msvensson@neptunus.(none)
f8bb9a4be3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 13:45:04 +02:00
osku@127.(none)
2e737c782a Merge 127.(none):/home/osku/mysql/5.0/clean 
into  127.(none):/home/osku/mysql/5.0/13497
 2005-09-28 14:40:02 +03:00
kent@mysql.com
5b79dbb2eb mysql_config.sh: 
Added -lz to link using libmysqld
 2005-09-28 13:39:28 +02:00
kent@mysql.com
99ce6f0b76 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-28 13:37:58 +02:00
msvensson@neptunus.(none)
60e5493d5d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 13:30:33 +02:00
msvensson@neptunus.(none)
26793f3039 Correct merge error, warning ended up after new tests from 4.1 2005-09-28 13:29:13 +02:00
osku@127.(none)
a2749ca270 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql/5.0/clean
 2005-09-28 14:28:00 +03:00
osku@127.(none)
d440270dcd InnoDB: Remove compiler warnings. 2005-09-28 14:26:33 +03:00
kent@mysql.com
07a9052bce Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-28 13:23:57 +02:00
jan@hundin.mysql.fi
dc80450410 Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669).
 2005-09-28 14:14:49 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
bb57385f54 Added a cast. Fix for Metrowerks compiler. 2005-09-28 14:12:44 +03:00
jonas@perch.ndb.mysql.com
63ebbf217d ndb - bug#13512 
core dump on no free node id
 2005-09-28 11:58:34 +02:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 11:34:53 +02:00
msvensson@neptunus.(none)
70b9b5eef3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 10:29:04 +02:00
osku@127.(none)
d98567c49f InnoDB: Print better error message when log files are missing/corrupt 
(bug #13497).
 2005-09-28 11:14:25 +03:00
stewart@mysql.com
86374681f6 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-09-28 13:19:59 +10:00
patg@krsna.patg.net
acdc193a45 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-5.0
 2005-09-27 15:04:26 -07:00
evgen@moonbone.local
c0b8b6db48 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13356-bug-4.1-mysql
 2005-09-28 01:06:16 +04:00
evgen@moonbone.local
4f4711bd49 Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items. 
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.
 2005-09-28 00:58:12 +04:00
dlenev@mysql.com
ed1c0cbd07 Fix for bug #13501 "build problem: too many arguments to function my_bool 
acl_init".

Updated calls to acl_init()/grant_init() in init_embedded_server() - their
signatures were changed recently, now they don't need argument for passing
pointer to THD object (this code was only compiled if one built embedded
server library with --with-embedded-privilege-control switch).
 2005-09-27 23:36:02 +04:00
guilhem@mysql.com
f5fc8f315e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-09-27 21:19:50 +02:00
patg@krsna.patg.net
12e41de0cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-5.0
 2005-09-27 09:42:27 -07:00
patg@krsna.patg.net
ac924f6b4f BUG #7815 - Post-review fixes required for push. 2005-09-27 09:40:51 -07:00