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
53248 commits 2793 branches 343 tags 1.7 GiB
Commit graph

53248 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
tsmith@ramayana.hindu.god
a6d50c102c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-18 12:25:31 -07:00
tsmith@ramayana.hindu.god
732eb0b4ce Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-18 12:18:36 -07:00
tsmith@ramayana.hindu.god
71faa39360 Merge ramayana.hindu.god:/home/tsmith/m/bk/50-b28555 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-02-18 12:04:54 -07:00
tsmith@ramayana.hindu.god
958f615f36 Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-02-18 12:04:22 -07:00
tsmith@ramayana.hindu.god
69dcac5a7e Bug #28555 Upgrading MySQL Fails to shut down old server and kills socket file 
Check for an existing MySQL server package from a different vendor or
major MySQL version.  In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.
 2008-02-18 12:03:39 -07:00
tsmith@ramayana.hindu.god
845b94451f Bug #28460 mysqlhotcopy silently skips a database with two alphanumerics name 
Remove code from mysqlhotcopy which deals with the so-called "RAID"
feature of older MyISAM.
 2008-02-18 11:48:33 -07:00
gkodinov/kgeorge@magare.gmz
ee33f13668 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/warnings-5.1-opt
 2008-02-18 18:23:05 +02:00
gkodinov/kgeorge@magare.gmz
459ca66609 Fixed duplicate defition warning for bug 31887 2008-02-18 18:21:14 +02:00
holyfoot/hf@hfmain.(none)
0076314bde Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/32942/my51-32942
 2008-02-18 19:25:12 +04:00
kent@kent-amd64.(none)
6761108f29 Merge mysql.com:/home/kent/bk/maria/mysql-maria-gca 
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
 2008-02-18 16:23:00 +01:00
holyfoot/hf@hfmain.(none)
6f044073b8 Merge mysql.com:/home/hf/work/32942/my50-32942 
into  mysql.com:/home/hf/work/32942/my51-32942
 2008-02-18 19:20:14 +04:00
holyfoot/hf@hfmain.(none)
652b7099ca Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/32942/my50-32942
 2008-02-18 19:18:44 +04:00
anozdrin/alik@quad.
f4659b38af Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-02-18 18:12:37 +03:00
anozdrin/alik@quad.
48058cf10b Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-02-18 18:12:05 +03:00
holyfoot/hf@hfmain.(none)
0c8df13cda Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/32942/my51-32942
 2008-02-18 19:08:35 +04:00
kent@mysql.com/kent-amd64.(none)
5d3d61f459 CMakeLists.txt: 
Missing "sql_profile.cc" was added
 2008-02-18 14:46:47 +01:00
holyfoot/hf@hfmain.(none)
377ecd81c7 Merge mysql.com:/home/hf/work/32942/my50-32942 
into  mysql.com:/home/hf/work/32942/my51-32942
 2008-02-18 16:07:47 +04:00
kaa@kaamos.(none)
93cbe28aac Initialization order cleanups to get rid of warnings from the 
-Wreorder option added by the patch for bug#31326.
 2008-02-18 14:35:44 +03:00
kaa@kaamos.(none)
1e6e9ca6fe Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-17 17:00:01 +03:00
kaa@kaamos.(none)
7e43bc00f2 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-17 16:59:26 +03:00
kaa@kaamos.(none)
443c1a8b19 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-02-17 16:57:07 +03:00
kaa@kaamos.(none)
3ef2f282bb Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-17 15:57:28 +03:00
kaa@kaamos.(none)
5671fb90e7 Post-merge fix. 2008-02-17 15:07:41 +03:00
kaa@kaamos.(none)
5647dee192 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-17 14:57:01 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
7abba3b021 Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan" 
Problem is not about intervals and doesn't actually cause 'full table scan'.
We have an optimization for DISTINCT when we have
'DISTINCT field_from_first_join_table' we don't need to read all the
rows from the JOIN-ed table if we found one conforming row.
It stopped working in 5.0 as we return NESTED_LOOP_OK if we came upon
that case in the evaluate_join_record() and that doesn't break the
recordreading loop in sub_select().

Fixed by returning NESTED_LOOP_NO_MORE_ROWS in this case.
 2008-02-17 15:48:17 +04:00
kaa@kaamos.(none)
cb80b23e23 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-02-17 14:38:50 +03:00
kaa@kaamos.(none)
3daeb40f1f Merge kaamos.(none):/data/src/mysql-5.0 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-02-17 14:37:39 +03:00
kaa@kaamos.(none)
7b9dce58d9 Merge kaamos.(none):/data/src/mysql-4.1 
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
 2008-02-17 14:33:20 +03:00
gkodinov/kgeorge@magare.gmz
88af101d44 merge of bug 31887 5.0-opt->5.1-opt 2008-02-16 11:11:13 +02:00
gkodinov/kgeorge@magare.gmz
047b1a66a0 Merge magare.gmz:/home/kgeorge/mysql/work/B31887-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31887-5.1-opt
 2008-02-16 10:48:33 +02:00
gkodinov/kgeorge@magare.gmz
a781c1b140 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31887-5.0-opt
 2008-02-15 18:34:03 +02:00
gkodinov/kgeorge@magare.gmz
490ec62be4 Bug #31887: DML Select statement not returning same results 
when executed in version 5

Zero fill is a field attribute only. So we can't always 
propagate  constants for zerofill fields : the values and 
expression results don't have that flag.

Fixed by converting the const value to a string and 
using that in const propagation when the context allows it. 
Disable const propagation for fields with ZEROFILL flag in
all the other cases.
 2008-02-15 15:47:32 +02:00
anozdrin/alik@quad.
b25de63309 Add a test case for Bug#21704: Renaming column does not update 
FK definition.
 2008-02-15 14:14:09 +03:00
mkindahl@dl145h.mysql.com
a1a94e238f Adding waits to events_scheduling to prevent the test from 
failing on heavily loaded systems.
 2008-02-15 10:24:13 +01:00
pcrews@pcrews-mac-local.local
0a62b5584c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/34468/mysql-5.1-build-34468
 2008-02-14 11:54:56 -05:00
anozdrin/alik@quad.
6bf1306b13 A patch for Bug#18834: ALTER TABLE ADD INDEX on table with 
two timestamp fields.
  
The actual problem here was that CREATE TABLE allowed zero
date as a default value for a TIMESTAMP column in NO_ZERO_DATE mode.
  
The thing is that for TIMESTAMP date type specific rule is applied:
  column_name TIMESTAMP == column_name TIMESTAMP DEFAULT 0
whever for any other date data type
  column_name TYPE == column_name TYPE DEFAULT NULL
  
The fix is to raise an error when we're in NO_ZERO_DATE mode and
there is TIMESTAMP column w/o default value.
 2008-02-14 18:13:40 +03:00
kaa@kaamos.(none)
6736c1b9e7 Post-merge fix after merging the patch for bug#31590 to 5.1: 
suppress the "Out of sort memory" error in the error log.
 2008-02-14 16:33:11 +03:00
pcrews@pcrews-mac-local.local
dd71e64ae7 Bug#34468 - csv_not_null fails 
Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
of expecting warning and re-recorded .result file.
 2008-02-14 08:17:47 -05:00
kaa@kaamos.(none)
eeab00e3d0 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-14 12:54:23 +03:00
mkindahl@dl145h.mysql.com
fd5d7fa761 Fixing test rpl_events to not give false failures. 2008-02-14 10:53:12 +01:00
kaa@kaamos.(none)
88132e290a Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-14 12:49:39 +03:00
kaa@kaamos.(none)
f41a5edfc7 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-02-14 12:48:25 +03:00
mkindahl@dl145h.mysql.com
8906700e13 Fixes to try to handle valgrind warnings identical to those in 
BUG#24387, which is closed since long.
 2008-02-14 09:53:01 +01:00
tsmith@ramayana.hindu.god
cd6e2ad99f Bug #21158 mysql_config doesn't include -lmygcc 
Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.

Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.
 2008-02-14 01:05:25 -07:00
tomas@poseidon.bredbandsbolaget.se
fe9ee5c7bf correct merge error 2008-02-14 00:02:25 +01:00
tomas@poseidon.bredbandsbolaget.se
be0324b005 correct manual merge 2008-02-13 23:10:47 +01:00
gshchepa/uchum@host.loc
e49dffa81d Merge host.loc:/home/uchum/work/5.1-opt-gca 
into  host.loc:/home/uchum/work/5.1-opt
 2008-02-14 01:33:06 +04:00
tomas@poseidon.bredbandsbolaget.se
1414ba3aed Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 20:59:55 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6 correction of merge 2008-02-13 20:52:01 +01:00