mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54289 commits 2793 branches 343 tags 1.7 GiB
Commit graph

24297 commits

Author SHA1 Message Date
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5397f8c90d Fix for bug #35732: read-only blocks SELECT statements in InnoDB 
Problem: SELECTs prohibited for a transactional SE in autocommit mode
if read_only is set.

Fix: allow them.
 2008-04-08 10:20:58 +05:00
kostja@dipika.(none)
a9fff11f49 Fix a compilation warning (unused variable). 2008-04-07 23:57:47 +04:00
kostja@dipika.(none)
63944ed537 A fix for Bug#32724 "innodb_mysql.test fails randomly". 
Enable back the disabled test case.
 2008-04-07 15:42:32 +04:00
joerg@trift2.
0e6f1a731f Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/work-5.1
 2008-04-05 13:37:05 +02:00
joerg@trift2.
2092e0c004 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/tmp-5.1
 2008-04-04 19:25:39 +02:00
mleich@five.local.lan
40092a7932 Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.1-build
 2008-04-04 14:50:46 +02:00
joerg@trift2.
e0b54b4817 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 10:26:41 +02:00
cmiller@zippy.cornsilk.net
7b77e36909 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 13:21:02 -04:00
cmiller@zippy.cornsilk.net
61a528c0b2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-03 13:19:55 -04:00
cmiller@zippy.cornsilk.net
7e78633f81 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
 2008-04-03 13:14:57 -04:00
cmiller@zippy.cornsilk.net
9ff7a0cedc Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 
When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).
 2008-04-03 11:32:00 -04:00
cmiller@zippy.cornsilk.net
bb7d01f73d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 11:30:38 -04:00
cmiller@zippy.cornsilk.net
a296df9581 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-03 11:28:10 -04:00
cmiller@zippy.cornsilk.net
d0031df2be Replaced full-stop character in error message. 2008-04-02 12:18:21 -04:00
cmiller@zippy.cornsilk.net
844939eed6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-02 10:58:37 -04:00
cmiller@zippy.cornsilk.net
c83c18c058 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-02 10:56:49 -04:00
kent/mysqldev@mysql.com/production.mysql.com
fd1bd7547a mysqld.cc: 
Corrects build problems embedded on Windows
Makefile.am:
  Install .sym or mysqld-debug if exists
query_cache_debug.test, query_cache_debug.result:
  Set more resonable query cache size (bug#35749)
CMakeLists.txt:
  Added missing stacktrace.c
 2008-04-02 00:43:17 +02:00
mkindahl@dl145h.mysql.com
013fd23675 Post-merge fixes. 2008-04-01 18:50:35 +02:00
cmiller@zippy.cornsilk.net
15b1a5ff54 Bug#15776: 32-bit signed int used for length of blob 
Based on contributed patch from Martin Friebe, CLA from 2007-02-24.

The parser lacked support for field sizes after signed long,
when it should extend to 2**32-1.

Now, we correct that limitation, and also make the error handling
consistent for casts.
---
Fix minor complaints of Marc Alff, for patch against B-g#15776.
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
---
testing
 2008-04-01 12:19:20 -04:00
thek@adventure.(none)
e392f406f5 Bug#26208 a typo (wrong variable name) in mysql_prepare_update function's source code? 
This is a code clean up.
Removed redundant (and unused) TABLE_LIST variable intended as an IN-
parameter for setup_order.
 2008-04-01 14:41:13 +02:00
mkindahl@dl145h.mysql.com
3f174f66e2 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-04-01 11:54:25 +02:00
df@pippilotta.erinye.com
49d1eeaeb9 Portability fix 2008-04-01 11:03:12 +02:00
mkindahl@dl145h.mysql.com
fb9e8ed5e8 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-04-01 08:43:15 +02:00
cmiller@zippy.cornsilk.net
a878c1b9c1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
 2008-03-31 14:32:56 -04:00
davi@endora.local
ad6d59e9b2 Merge mysql.com:/Users/davi/mysql/bugs/ps-cleanup-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2008-03-31 09:54:36 -03:00
kostja@dipika.(none)
ad4113f72f Remove some unused code. 2008-03-31 14:52:41 +04:00
gkodinov/kgeorge@magare.gmz
0463ba57a5 Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 11:57:18 +03:00
mkindahl@dl145h.mysql.com
a7fe4abc55 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-03-31 09:57:29 +02:00
gkodinov/kgeorge@magare.gmz
dd62320d0e Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 10:40:39 +03:00
iggy@amd64.(none)
f13f6eaff3 Bug#26243 - Cleanup Valgrind error 2008-03-30 15:46:37 -04:00
aelkin/andrei@mysql1000.(none)
c7447a25c6 Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-30 14:12:27 +03:00
aelkin/andrei@mysql1000.(none)
ba7b1a7e55 Bug #35675 reset master finds assert if a binlog file can not be deleted 
If a binlog file is manually replaced with a namesake directory the internal purging did
not handle the error of deleting the file so that eventually
a post-execution guards fires an assert.

Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
at an attempt to delete it.
The same applied to the index file deletion.

The cset carries pieces of manual merging.
 2008-03-30 00:54:08 +02:00
gkodinov/kgeorge@macbook.gmz
fd9993db87 fixed warnings from the fix of 26243 2008-03-29 17:50:46 +02:00
gkodinov/kgeorge@macbook.gmz
84f761daaf fixes for warnings and compile errors for the fix of bug 26243 2008-03-29 16:12:23 +02:00
aelkin/andrei@mysql1000.(none)
d3d0a00635 Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 15:00:12 +02:00
aelkin/andrei@mysql1000.(none)
22536fc53e Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 14:19:53 +02:00
gkodinov/kgeorge@macbook.gmz
7cb4b7c19d fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
anozdrin/alik@quad.opbmk
f5c4b91cf7 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged
 2008-03-28 23:54:14 +03:00
iggy@amd64.(none)
b9877b84ac Merge amd64.(none):/src/mysql-5.0-bugteam 
into  amd64.(none):/src/bug26243/my50-bug26243
 2008-03-28 16:01:05 -04:00
mats@mats-laptop.(none)
e72113d957 Fixes to eliminate compiler warnings. 2008-03-28 19:57:39 +01:00
anozdrin/alik@quad.opbmk
73345d0fbd Fix for Bug#32748: Inconsistent handling of assignments to 
general_log_file/slow_query_log_file.

The problem was that log file path was rejected if directory
path was empty. The fix is to reject log file path only if it
is entirely empty.
 2008-03-28 21:46:18 +03:00
anozdrin/alik@quad.opbmk
1e9e009e21 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt
 2008-03-28 21:43:23 +03:00
iggy@amd64.(none)
79e434bc67 Bug#26243 mysql command line crash after control-c 
- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C
 2008-03-28 14:02:27 -04:00
mats@mats-laptop.(none)
78a0706a08 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
 2008-03-28 18:58:22 +01:00
gkodinov/kgeorge@magare.gmz
fd64a7735d fixed compiler error in 5.1-marvel. 2008-03-28 18:43:13 +02:00
evgen@moonbone.local
287177dea1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  moonbone.local:/work/27219-bug-5.1
 2008-03-28 19:39:34 +03:00
anozdrin/alik@quad.opbmk
2880d2081e Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW. 
The problem was that LOAD DATA code (sql_load.cc) didn't take into
account that there may be items, representing references to other
columns. This is a usual case in views. The crash happened because
Item_direct_view_ref was casted to Item_user_var_as_out_param,
which is not a base class.

The fix is to
  1) Handle references properly;
  2) Ensure that an item is treated as a user variable only when
     it is a user variable indeed;
  3) Report an error if LOAD DATA is used to load data into
     non-updatable column.
 2008-03-28 18:59:13 +03:00
gkodinov/kgeorge@macbook.gmz
450a6385c4 fixed a hand in 5.1-marvel : 
Removed a double release of the mutex on error
 2008-03-28 17:24:23 +02:00
anozdrin/alik@quad.opbmk
d02459cbae A patch for Bug#34820: log_output can be set to illegal value. 
We have "set" variables, which can accept empty values
(like sql_mode), and which can not (like log_output). The problem
was that the code does not distinguish them and allow empty
values for every set variable.

The fix is to introduce an attribute of a set variable telling
whether it can accept empty values.
 2008-03-28 18:10:04 +03:00
evgen@moonbone.local
8fe48b6875 Merge moonbone.local:/work/27219-5.0-opt-mysql 
into  moonbone.local:/work/27219-bug-5.1
 2008-03-28 18:09:14 +03:00