mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33637 commits 2781 branches 343 tags 1.6 GiB
Commit graph

33637 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
d689f2fa70 Cleanups after review of WL#602 
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
 2006-05-03 19:40:52 +03:00
monty@mysql.com
9756d7f853 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-03 16:03:19 +03:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602) 
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
 2006-05-03 15:59:17 +03:00
bar@mysql.com
c51d7419e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
 2006-05-03 12:34:51 +05:00
knielsen@mysql.com
4ba1a4b3cd Windows build fixes for CMake 2006-05-03 09:06:22 +02:00
bar@mysql.com
467052aa5b Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
 2006-05-03 09:08:12 +05:00
dlenev@mysql.com
5cae540501 Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-05-02 23:16:53 +04:00
cmiller@zippy.(none)
ba0752e125 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
 2006-05-02 15:09:35 -04:00
cmiller@zippy.(none)
5de7b78bd2 More merging assistence. 
Logging behavior changed in early 5.1.  (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)
 2006-05-02 15:07:00 -04:00
cmiller@zippy.(none)
230b52a835 Manually merged 2006-05-02 13:56:43 -04:00
cmiller@zippy.(none)
4d15fc5ee0 Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
 2006-05-02 13:55:03 -04:00
cmiller@zippy.(none)
0f63c3d39c An update to as-yet unused new feature of snprintf, which was added to bring 
our sprintf()-alike in sync with our fprintf()-alike features.
 2006-05-02 13:42:35 -04:00
elliot@mysql.com
c0b5b3cd40 Fix spelling in comments as requested by Osku 
This will make charset code easier to understand
 2006-05-02 09:13:58 -04:00
dlenev@mysql.com
c40f8557dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/mysql-5.0-bg11081
 2006-05-02 17:07:23 +04:00
gluh@eagle.intranet.mysql.r18.ru
19de86dd63 WL#2257 REFERENTIAL_CONSTRAINTS view 
added I_S.REFARENTIAL_CONSTRAINTS table
 2006-05-02 16:31:39 +05:00
knielsen@mysql.com
f0341ac431 Fix a bunch of non-Linux compile failures. 2006-05-02 09:19:54 +02:00
holyfoot@mysql.com
aaf2c26e01 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.clean
 2006-05-02 09:01:13 +05:00
holyfoot@deer.(none)
aab0e9c24e Win build fix 2006-05-02 08:59:49 +05:00
cmiller@zippy.(none)
1205ae8276 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
 2006-05-01 22:50:36 -04:00
cmiller@zippy.(none)
85ffd9640e SECURITY FIX 
Bug#17667: An attacker has the opportunity to bypass query logging.

This adds a new, local-only printf format specifier to our *printf functions
that allows us to print known-size buffers that must not be interpreted as 
NUL-terminated "strings."

It uses this format-specifier to print to the log, thus fixing this 
problem.
 2006-05-01 22:10:50 -04:00
kent@mysql.com
b050f975c4 Merge 2006-05-02 02:45:04 +02:00
jimw@mysql.com
44e984276c Fix name of error in view_grant test 2006-05-01 17:12:51 -07:00
jimw@mysql.com
052b126853 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-01 11:38:15 -07:00
kent@mysql.com
715833dbb7 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-05-01 20:23:36 +02:00
jimw@mysql.com
7afa8aa73b Merge mysql.com:/home/jimw/my/mysql-5.1-18495 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-01 11:22:47 -07:00
kent@mysql.com
e8fb05845b Merge 2006-05-01 20:16:19 +02:00
jimw@mysql.com
c571f6ff57 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 10:59:14 -07:00
kent@mysql.com
f45d6d3cc6 mysql.spec.sh: 
Use "./libtool --mode=execute" to find real path to executables
 2006-05-01 19:48:31 +02:00
cmiller@zippy.(none)
21bec19920 Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
 2006-05-01 13:41:40 -04:00
holyfoot@mysql.com
22fc7774d0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.clean
 2006-05-01 22:21:28 +05:00
holyfoot@deer.(none)
9b832153f9 Fix for Win build 2006-05-01 22:16:08 +05:00
jimw@mysql.com
189241b03e Merge mysql.com:/home/jimw/my/mysql-5.0-18607 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 09:12:36 -07:00
jimw@mysql.com
9ab852bb35 Merge mysql.com:/home/jimw/my/mysql-5.0-18312 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 09:11:57 -07:00
cmiller@zippy.(none)
6af3f88f07 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
 2006-05-01 09:46:00 -04:00
jimw@mysql.com
b4586b2908 Clean up after big merge 2006-05-01 00:14:32 -07:00
jimw@mysql.com
f21c110d13 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-30 13:27:38 -07:00
jimw@mysql.com
08eb2588bf Fix error in having.test to use name instead of number (fixes merge problem) 2006-04-30 13:06:28 -07:00
jimw@mysql.com
3f239914d7 Merge mysql.com:/home/jimw/my/tmp_merge 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-30 09:43:26 -07:00
brian@zim.(none)
8ab2897e93 Merge zim.(none):/home/brian/mysql/tmp_merge 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-04-29 17:43:26 -07:00
kent@mysql.com
39bd702756 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-29 22:48:22 +02:00
kent@mysql.com
5e717959d0 config-win.h: 
Fix strange "double" define for popen.
  Avoid warnings about sprintf() etc. being unsafe.
  Corrected typo "#endfif"
 2006-04-29 15:58:02 +02:00
kent@mysql.com
a14f1250d6 configure.in: 
Changed version to 4.1.20
 2006-04-29 07:32:12 +02:00
kent@mysql.com
b714a0cec4 mysql.spec.sh: 
Backport of changes in 5.0 (bug#18294)
 2006-04-29 01:28:04 +02:00
kent@mysql.com
cc6ad16b16 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-29 00:52:30 +02:00
elliot@mysql.com
604b5836bb BUG#19145: mysqld crashes if you set the default value of an enum field to NULL 
Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.
 2006-04-28 12:15:29 -04:00
msvensson@devsrv-b.mysql.com
bad7e32a94 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-04-28 17:48:50 +02:00
paul@polar.kitebird.com
7c4ddc8bd4 mysqlslap.c: 
Avoid embedding a bunch of whitespace in --help message.
 2006-04-28 10:44:08 -05:00
kent@mysql.com
0222a31358 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-04-28 17:23:14 +02:00
kent@mysql.com
50e8ba04cf mysql.spec.sh: 
Include and run mysql_upgrade if needed (bug#19353)
 2006-04-28 17:03:11 +02:00
kent@mysql.com
18b3a2c902 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-28 16:27:39 +02:00