mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53400 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2906 commits

Author SHA1 Message Date
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:19:46 +03:00
gkodinov/kgeorge@magare.gmz
dbc3ef6c9f Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt
 2008-03-07 11:19:51 +02:00
gkodinov/kgeorge@magare.gmz
11cd97ed6b Bug #34909: mysqldump returns a 0 status on error when using 
--master-data

No error code was returned by mysqldump if it detects that binary
logging is not enabled on the server.
Fixed by returning error code.
 2008-03-07 11:15:49 +02:00
holyfoot/hf@hfmain.(none)
2356e0df6e Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/25097/my51-25097
 2008-02-27 13:54:34 +04:00
holyfoot/hf@hfmain.(none)
bf848358e5 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/25097/my50-25097
 2008-02-27 13:43:41 +04:00
holyfoot/hf@hfmain.(none)
b727a22d97 Merge mysql.com:/home/hf/work/25097/my50-25097 
into  mysql.com:/home/hf/work/25097/my51-25097
 2008-02-27 13:00:59 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
140ca59538 Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. 
There was no way to return an error from the client library
if no MYSQL connections was established.
So here i added variables to store that king of errors and
made functions like mysql_error(NULL) to return these.
 2008-02-27 12:42:43 +04:00
anozdrin/alik@quad.
bdc83bf2cb Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-02-26 19:34:02 +03:00
andrey@whirlpool.hristov.com
07d9c4eeb8 Fix for Bug#29605 
--local-infile=0 checks can be bypassed by sending a FETCH LOCAL FILE response
  
Add a check for CLIENT_LOCAL_FILES before sending a local file.
Beware, that all binary distributions enable sending of local files and it's up
to the programs which use libmysql to disable it, if they don't use this functionality.
Otherwise they are not safe.
 2008-02-22 18:45:45 +01:00
joerg@trift2.
25ab6afc03 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-22 16:14:27 +01:00
guilhem@gbichot4.local
3fe6684c48 fixes for build failures due to my yesterday's changeset forbidding 
bool in C.
 2008-02-19 18:45:11 +01:00
guilhem@gbichot4.local
045f3c4a5d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
 2008-02-18 23:36:57 +01:00
guilhem@gbichot4.local
9e2b31b026 Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> 
value" error even though the value was correct): a C function in my_getopt.c
was taking bool* in parameter and was called from C++ sql_plugin.cc,
but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
mismatches. Fixed, all other occurences of bool in C are removed, future
ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
 2008-02-18 23:29:39 +01:00
joerg@trift2.
341258dba4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-13 13:05:07 +01:00
mkindahl@dl145h.mysql.com
83dac31180 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-02-11 18:10:56 +01:00
mkindahl@dl145h.mysql.com
23d670c33e Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-02-11 18:09:17 +01:00
sven@riska.(none)
d1963d066b BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination 
Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.
 2008-02-08 18:17:00 +01:00
kostja@dipika.(none)
e9c887cc3d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
 2008-02-08 18:55:07 +03:00
kostja@dipika.(none)
0e4b6ea058 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dipika.(none):/opt/local/work/mysql-5.0-runtime
 2008-02-08 18:51:07 +03:00
kostja@dipika.(none)
092cadbdd1 Merge dipika.(none):/opt/local/work/mysql-5.0-runtime 
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
 2008-02-07 23:53:03 +03:00
kostja@dipika.(none)
bf7991ba2f Fix compile warning about undefined rmdir() function. 2008-02-07 23:52:30 +03:00
msvensson@pilot.mysql.com
4df354a6c5 Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime
 2008-02-07 14:07:41 +01:00
msvensson@pilot.mysql.com
04ca458fcb Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
 2008-02-07 12:42:49 +01:00
sven@riska.(none)
5746d8790d Merge riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.0-rpl 
into  riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.1-new-rpl
 2008-02-06 21:07:45 +01:00
sven@riska.(none)
ad316c259e Replace windows path separator backslash by unix path separator forward 
slash in filenames also for Create_file_log_event.
 2008-02-06 20:55:12 +01:00
tsmith@ramayana.hindu.god
c99d06a5f3 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-05 16:15:07 -07:00
mkindahl@dl145h.mysql.com
064eec03d1 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-02-01 20:28:30 +01:00
cbell/Chuck@mysql_cab_desk.
7db07f95fb BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine 
This patch adds code to convert the path for LOAD DATA INFILE 
events to a Unix path which is needed for running mysql client
on Windows.
 2008-02-01 13:11:03 -05:00
mkindahl@dl145h.mysql.com
4c95b29614 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-31 17:46:50 +01:00
cmiller@zippy.cornsilk.net
1f13c62225 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug24624/my50-bug24624 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug24624/my51-bug24624
 2008-01-30 18:15:00 -05:00
cmiller@zippy.cornsilk.net
806ff0187d Bug#24624: MySQL client ignores its own completion table 
Nothing was in the command-line dictionary, because of the wrong 
order of instructions when populating it.

This is a smaller, less optimistic patch that both fixes a bug and
refreshes the list of keywords that the command-line library (e.g., 
readline) can use to expand typed commands.  Now, read from the 
command list /after/ we free the list, not before.

The best way is to read the keywords from the lexer code, but that
doesn't work everywhere yet.  Grr.
 2008-01-30 16:51:39 -05:00
mkindahl@dl145h.mysql.com
2a864d1fd7 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-01-30 16:14:14 +01:00
mkindahl@dl145h.mysql.com
219a75056a Post-merge changes. 2008-01-30 16:03:00 +01:00
cmiller@zippy.cornsilk.net
c173a217d5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-01-29 18:24:38 -05:00
cmiller@zippy.cornsilk.net
3e23741bc6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-01-29 18:23:40 -05:00
cmiller@zippy.cornsilk.net
b040a97c2a Bug#33841: mysql client crashes when returning results for long-\ 
running queries

Bug#33976: buffer overflow of variable time_buff in function com_go()

An internal buffer was too short.  Overextending could smash the 
stack on some architectures and cause SEGVs.  This is not a problem
that could be exploited to run arbitrary code.

To fix, I expanded one buffer to cover all the size that could be
written to (we know the abolute max).
 2008-01-25 10:53:21 -05:00
tsmith@ramayana.hindu.god
ff4835385a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2008-01-23 11:48:29 -07:00
cmiller@zippy.cornsilk.net
71316696a1 Patch contributed by Jocelyn Fournier. CLA received 2007-02-27. 
Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed

mysqlcheck tests nullness of the engine type to know whether the
"table" is a view or not.  That also falsely catches tables that 
are severly damaged.

Instead, use SHOW FULL TABLES to test whether a "table" is a view
or not.

(Don't add new function.  Instead, get original data a smarter way.)

Make it safe for use against databases before when views appeared.
 2008-01-23 11:37:46 -05:00
tsmith@ramayana.hindu.god
6668554a8d Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-22 15:56:15 -07:00
kaa@kaamos.(none)
0cec5f8e4b Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 20:44:23 +03:00
kaa@kaamos.(none)
f8ade5e91b Merge kaamos.(none):/data/src/mysql-5.0 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-01-10 20:43:05 +03:00
tsmith@ramayana.hindu.god
68980477dd Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2008-01-04 19:59:37 -07:00
joerg@trift2.
9f96125023 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-21 12:53:05 +01:00
df@pippilotta.erinye.com
bea1bfd5c7 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-21 09:44:08 +01:00
serg@janus.mylan
d9ca7b670e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-20 22:11:37 +01:00
df@pippilotta.erinye.com
f7527b7856 BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump 2007-12-20 21:37:21 +01:00
brian@zim.(none)
97e3c6cbf4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/bk/mysql-5.1-arch
 2007-12-20 12:32:16 -08:00
brian@zim.(none)
4316829b75 client_priv.h: 
Removed dead option
mysqlslap.c:
  Updates from Paul for help.
  Removed dead option
 2007-12-20 12:23:35 -08:00
mkindahl@dl145h.mysql.com
bdea24f483 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2007-12-19 18:51:46 +01:00
tnurnberg@white.intern.koehntopp.de
977a189e24 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31752_/50-31752_
 2007-12-17 14:17:18 +01:00