mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26713 commits 2774 branches 343 tags 1.6 GiB
Commit graph

26713 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars@mysql.com
0abcffcb5d WL#2835: Base64 mysys functions 2005-10-14 01:14:23 +02:00
gluh@eagle.intranet.mysql.r18.ru
cac5b085cd after merge fix 2005-09-29 17:21:32 +05:00
gluh@mysql.com
b36f63e3ab 4.1 -> 5.0 merge 2005-09-29 16:35:50 +05:00
jan@hundin.mysql.fi
36edcbf4fa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-29 14:30:05 +03:00
gluh@eagle.intranet.mysql.r18.ru
f9762c47d0 Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment 
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.
 2005-09-29 16:17:45 +05:00
jan@hundin.mysql.fi
81f51fd47b Fix incorrectly merged changeset, these may not be before a first 5.0 test 
i.e. range test.
 2005-09-29 13:50:27 +03:00
osku@127.(none)
4676fc94c6 Merge 127.(none):/home/osku/mysql/5.0/clean 
into  127.(none):/home/osku/mysql/5.0/revcpy
 2005-09-29 13:39:27 +03:00
jan@hundin.mysql.fi
43b2dc617b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-29 13:15:09 +03:00
osku@127.(none)
ad52436711 InnoDB: Fix potential buffer underflow. 2005-09-29 13:02:18 +03:00
ingo@mysql.com
3ae0c86070 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-29 11:56:59 +02:00
marko@hundin.mysql.fi
d426c109f4 Minor corrections to InnoDB function comments 2005-09-29 12:37:27 +03:00
ingo@mysql.com
824dbfe34b Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-29 09:37:21 +02:00
ingo@mysql.com
68bc5a31e4 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-29 09:36:44 +02:00
jan@hundin.mysql.fi
6734ca6cbe Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669). This fixes InnoDB part of the bug.
 2005-09-29 08:34:38 +03: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
ingo@mysql.com
904723d7c5 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-28 20:09:52 +02:00
ingo@mysql.com
a9a38f815e Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-28 20:09:13 +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
ingo@mysql.com
b3c3db08f0 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-28 14:10:02 +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