mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49448 commits 2789 branches 343 tags 1.7 GiB
Commit graph

2031 commits

Author SHA1 Message Date
acurtis/antony@ltamd64.xiphis.org
a4dbc0990c Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-05-04 23:35:14 -07:00
dkatz@damien-katzs-computer.local
33f8677d88 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-04-30 17:47:58 -04:00
dkatz@damien-katzs-computer.local
b578abc0c1 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_frm_files
 2007-04-30 17:04:14 -04:00
istruewing@chilla.local
581b8504f3 WL#2936 - Falcon & MySQL plugin interface: server variables 
Avoid compiler warnings
 2007-04-30 18:49:38 +02:00
gshchepa/uchum@gshchepa.loc
3322b3c0b9 Fixed bug #20710. 
This bug occurs when error message length exceeds allowed limit: my_error()
function outputs "%s" sequences instead of long string arguments.

Formats like %-.64s are very common in errmsg.txt files, however my_error()
function simply ignores precision of those formats.
 2007-04-29 00:50:33 +05:00
tsmith@quadxeon.mysql.com
bfb0448a4d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-28 01:36:09 +02:00
tsmith@quadxeon.mysql.com
b90b0c7eb2 Bug #27390: mysqld_multi --config-file= not working as documented 
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options.  Treat old --config-file argument as if --defaults-extra-file
had been specified instead.

Plus a few other defaults-related cleanups.
 2007-04-28 01:27:54 +02:00
istruewing@chilla.local
e327818c28 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
 2007-04-27 19:09:39 +02:00
serg@sergbook.mysql.com
31c1a1c9c3 fixed: memleak in --help, sigsegv on shutdown 
Ingo's patch:
WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for plugin string variables with their
default values.
Added deallocation of string values before a plugin and its
variables is deleted.
Added examples to plugin_example
 2007-04-26 21:26:04 +02:00
istruewing@chilla.local
98ff6f0a95 WL#2936 - Falcon & MySQL plugin interface: server variables 
Added initialization for the plugin structure created in
plugin_add().
Made a correct argument vector in mysql_install_plugin():
handle_options() assumes that arg0 (program name) always exists.
 2007-04-24 10:40:23 +02:00
cmiller@zippy.cornsilk.net
28dbc263f6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint--bug27894
 2007-04-23 20:46:06 -04:00
cmiller@zippy.cornsilk.net
d81f116534 Contributed patch from Jorge Bernal Ordovás. CLA#42 
Bug#27894: mysqlbinlog formats timestamp wrong in comment

Date stamps lack zero padding, and so are meaningless.

Implement minimum-width zero padding for the percent-escape sequences
used in the logging code.
 2007-04-23 17:58:33 -04:00
cmiller@zippy.cornsilk.net
bd31322626 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2007-04-20 13:52:57 -04:00
cmiller@zippy.cornsilk.net
0b69216315 Avoid compiler warnings. 2007-04-20 13:49:06 -04:00
cmiller@zippy.cornsilk.net
dfdc475a57 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint--pthreadkeycreate 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2007-04-19 17:23:41 -04:00
cmiller@zippy.cornsilk.net
28b3218e45 Bug #27964: pthread_key_create doesn't set errno, so don't report \ 
errno

Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.

Instead, capture the return value, which is the real error value, 
and instead report that.
 2007-04-19 17:07:11 -04:00
dkatz@damien-katzs-computer.local
cbcb418f76 Bug #25761 Table is partially created when disk is full, causing database corruption 2007-04-19 13:41:12 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df75e6e50e Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26851/b26851.5.0
 2007-04-19 11:45:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757 Merge mysql.com:/home/ram/work/b26851/b26851.5.0 
into  mysql.com:/home/ram/work/b26851/b26851.5.1
 2007-04-19 11:07:19 +05:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-18 14:55:42 -06:00
tsmith@siva.hindu.god
39496731a2 Merge siva.hindu.god:/home/tsmith/m/bk/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-04-18 14:50:32 -06:00
istruewing@chilla.local
3a0d2806df WL#2936 - Falcon & MySQL plugin interface: server variables 
Fixed a compiler dependent expression to be more portable.
Initialized 'dummy' in construct_help_options() so that loaded
plugin show themselves as TRUE in the help output.
 2007-04-18 14:37:57 +02:00
dkatz@damien-katzs-computer.local
227115fa2b Merge damien-katzs-computer.local:/Users/dkatz/50b 
into  damien-katzs-computer.local:/Users/dkatz/51merge
 2007-04-16 14:08:03 -04:00
dkatz@damien-katzs-computer.local
138f003738 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50b
 2007-04-16 13:49:17 -04:00
monty@mysql.com/narttu.mysql.fi
72d135bec5 Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc) 
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
 2007-04-16 17:08:29 +03:00
serg@sergbook.mysql.com
6bc9bc92df Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
 2007-04-16 10:37:50 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746 Fix for 
bug #27715: mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow

Using strmov() to copy an argument may cause overflow 
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit 
the longest message.
 2007-04-16 12:28:02 +05:00
serg@janus.mylan
3ecbb5a443 wl#2936 - fixing problems 2007-04-13 19:23:02 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
c66f50fa68 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
 2007-04-13 09:04:34 +03:00
dkatz@damien-katzs-computer.local
dac9f99327 Bug #27322 failure to allocate transaction_prealloc_size causes crash 
Fix for when memory pre-allocation fails.
 2007-04-12 18:03:26 -04:00
jani@ua141d10.elisa.omakaista.fi
335153121b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-04-12 12:50:02 +03:00
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf my_memmem.c: 
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
 2007-04-11 01:47:42 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-10 16:28:47 +03:00
joerg@trift2.
22f066e354 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-07 20:46:43 +02:00
kent@mysql.com/kent-amd64.(none)
6249bb34a4 Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-build 
into  mysql.com:/home/kent/bk/sotest/mysql-5.0-build
 2007-04-05 08:30:49 +02:00
kent@mysql.com/kent-amd64.(none)
8cc67c011e Deleted reject files accidently checked in 
configure.in.rej
  include/my_global.h.rej
  BUILD/SETUP.sh.rej
  mysys/thr_alarm.c.rej
  include/my_pthread.h.rej
 2007-04-05 08:30:16 +02:00
jani@ua141d10.elisa.omakaista.fi
e40d3631a3 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-04 21:25:39 +03:00
tsmith@quadxeon.mysql.com
a95aa68008 Portability fix to work around OS X -x86 toolchain bug with common (uninitialized data) symbols 2007-04-04 11:41:43 +02:00
tsmith@quadxeon.mysql.com
2117193783 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 11:05:22 +02:00
jani@ua141d10.elisa.omakaista.fi
e4fde44948 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-04-03 14:51:32 +03:00
jamppa@bk-internal.mysql.com
879725900b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-04-03 13:51:31 +02:00
kostja@bodhi.local
93d0316f45 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-04-03 14:34:37 +04:00
msvensson@pilot.blaudden
fc904eaead Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
bb9a601829 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-02 10:50:39 +02:00
serg@janus.mylan
00f383ff18 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
 2007-04-02 09:21:19 +02:00
istruewing@chilla.local
facba6ba3a Post merge fix 2007-03-30 09:14:11 +02:00
istruewing@chilla.local
a4ad591dd8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-30 07:46:52 +02:00
svoj@april.(none)
310f12591b Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines
 2007-03-29 22:01:51 +05:00
svoj@mysql.com/april.(none)
75f0416532 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
 2007-03-29 21:50:54 +05:00
jani@ua141d10.elisa.omakaista.fi
b8d6c2e970 Merged from 5.0 2007-03-29 19:31:42 +03:00