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

35136 commits

This branch
This branch
All branches
Author SHA1 Message Date
mikael@dator5.(none)
529ab385a1 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug17138
 2006-06-19 22:52:31 -04:00
mikael@dator5.(none)
007fabb218 Fixes 2006-06-19 22:49:00 -04:00
mikael@dator5.(none)
8bd81e1fee BUG#17138: Error in stored procedure due to fatal error when not really 
a fatal error. New handling of ignore error in place.
 2006-06-19 20:56:50 -04:00
evgen@moonbone.local
c0850425e5 rpl_log.test, rpl_stm_log.result: 
Fixed failing test case
field.cc, item_cmpfunc.cc, select.result:
  After merge fix
 2006-06-19 04:26:27 +04:00
evgen@moonbone.local
79c91f6214 Manually merged 2006-06-18 14:56:35 +04:00
serg@serg.mylan
8c4206a31d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-17 16:45:25 +02:00
serg@serg.mylan
48c453a40b atomic ops: 
my_atomic_XX_t -> intXX, no implicit locking anymore
    simplified framework, support for requested cleanups
 2006-06-17 16:20:39 +02:00
pekka@clam.ndb.mysql.com
5d3aa23d2a ndb - bug#19285 post merge 5.0->5.1 fix (error codes) 2006-06-17 13:12:38 +02:00
pekka@clam.ndb.mysql.com
adc433484f Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
 2006-06-17 13:05:31 +02:00
pekka@clam.ndb.mysql.com
35416445da ndb - bug#19285 minor fixes 2006-06-17 13:00:17 +02:00
pekka@clam.ndb.mysql.com
95aa9c28f2 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
 2006-06-17 11:10:43 +02:00
evgen@moonbone.local
09e84bf484 Merge moonbone.local:/work/tmp_merge-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 03:35:10 +04:00
evgen@moonbone.local
1aedd2ed3e Manually merged 2006-06-17 02:57:50 +04:00
evgen@moonbone.local
59b204fe08 select.result: 
After merge fix
 2006-06-17 02:52:14 +04:00
evgen@moonbone.local
7f24667598 Manually merged 2006-06-17 02:11:12 +04:00
evgen@moonbone.local
592e080643 Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-17 01:57:25 +04:00
evgen@moonbone.local
28cf3c3e64 Manually merged 2006-06-17 00:58:36 +04:00
evgen@moonbone.local
b8b9738e0b item_strfunc.cc: 
Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.
 2006-06-16 23:46:37 +04:00
serg@serg.mylan
694c1db79a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-16 21:39:10 +02:00
serg@serg.mylan
2893e2091a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-16 21:39:09 +02:00
petr@outpost.site
86f2f5828d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-16 23:39:09 +04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
1327ca0168 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-fix
 2006-06-16 15:39:08 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
0237f03652 Fix for broken compile if not compiling with partitioning 2006-06-16 15:04:35 -04:00
serg@serg.mylan
c4dd4a398b remove wrong assert 2006-06-16 16:26:30 +02:00
elliot@lost.local
23ac9266ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1
 2006-06-16 09:28:46 -04:00
stewart@willster.(none)
66d7d65000 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-16 21:35:49 +10:00
stewart@mysql.com
b5165c371e Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2006-06-16 21:01:02 +10:00
stewart@willster.(none)
0811fd79f1 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-16 20:52:21 +10:00
serg@serg.mylan
d00b56549c String::set(double) and set(longlong) -> set_real() and set_int() 
fix Field::store(double) being used instead of store(longlong)

NB: overloading functions is evil
 2006-06-16 12:17:20 +02:00
ramil@mysql.com
f2899063ee after-merge fixes. 2006-06-16 14:05:58 +05:00
stewart@mysql.com
45d7e75cb7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-16 18:54:20 +10:00
mskold@mysql.com
49790e0d73 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-16 08:47:46 +02:00
igor@rurik.mysql.com
ee2e2d0c6d Post_merges fixes. 2006-06-15 20:29:05 -07:00
elliot@mysql.com
10fd4b0f0f Fixing false alarm errors on windows build from a clean clone. 2006-06-15 22:46:52 -04:00
igor@rurik.mysql.com
1241d86787 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-15 18:40:18 -07:00
igor@rurik.mysql.com
9b7ecb5553 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-15 18:36:46 -07:00
serg@serg.mylan
0845bc4936 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 23:50:32 +02:00
petr@outpost.site
a3c4c13f3f Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-16 01:50:31 +04:00
serg@serg.mylan
ce07f4b903 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 23:50:31 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
5d2d3a53c9 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
 2006-06-15 17:50:30 -04:00
knielsen@mysql.com
061bdf919f BUG#19940: Add Valgrind suppression for false alarm report. 2006-06-15 22:02:26 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
c8da9ebda3 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
 2006-06-15 16:00:54 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
b631659c6c BUG#20397: Crash when alter table t1 engine = x; 
Review fixes
 2006-06-15 15:56:47 -04:00
serg@serg.mylan
3c609f0aa3 don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS 
don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts
 2006-06-15 21:43:29 +02:00
evgen@moonbone.local
4dfd3af232 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/18175-bug-5.0-opt
 2006-06-15 22:10:47 +04:00
evgen@moonbone.local
0fb6b044e0 Fixed bug#18175: The nest_level counter wasn't decremented for union parts which 
resulted in a wrong error message.

The nest_level counter indicates the depth of nesting for a subselect. It is
needed to properly resolve aggregate functions in nested subselects. Obviously 
it shouldn't be incremented for UNION parts because they have the same level of
nesting. This counter was incremented by 1 in the mysql_new_select() function
for any new select and wasn't decremented for UNION parts. This resulted in
wrongly reported error messages.

Now the nest_level counter is decremented by 1 for any union part.
 2006-06-15 22:09:58 +04:00
evgen@moonbone.local
d22c082b87 Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt 
into moonbone.local:/work/16377-4.1-after
 2006-06-15 16:41:26 +04:00
evgen@moonbone.local
2877b5ef64 item_cmpfunc.h, cast.result: 
Post fix for bug#16377
 2006-06-15 16:39:18 +04:00
ramil@mysql.com
c15a5a2b26 Merge mysql.com:/usr/home/ram/work/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-15 17:37:47 +05:00
petr@outpost.site
86420b38aa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-15 15:38:14 +04:00