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

30716 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@moonbone.local
92b4a73a20 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-19 03:50:09 +04:00
evgen@moonbone.local
a92a55bb97 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-19 01:16:18 +04:00
evgen@moonbone.local
c02e6f2a5b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-06-18 20:48:48 +04:00
pekka@clam.ndb.mysql.com
ff66be2629 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50
 2006-06-17 17:33:08 +02:00
kent@mysql.com
b95c0c4edd Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-06-17 15:42:24 +02:00
kent@mysql.com
ad87e7b314 Makefile.am: 
Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
  Avoid error message for target 'distclean' and no Makefile
 2006-06-17 15:37:23 +02:00
pekka@clam.ndb.mysql.com
61dd500900 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
 2006-06-17 13:53:43 +02:00
pekka@clam.ndb.mysql.com
35416445da ndb - bug#19285 minor fixes 2006-06-17 13:00:17 +02:00
kent@mysql.com
cae47f4b20 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-06-17 11:38:16 +02:00
kent@mysql.com
6783fc830f make_win_src_distribution.sh: 
Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt
 2006-06-17 11:33:34 +02:00
kent@mysql.com
1b7d4cacfb make_win_src_distribution.sh: 
Don't try copy non existing extra/{sql_state,mysqld_error}.h
 2006-06-17 10:44:52 +02:00
kent@mysql.com
10833287ef Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-06-17 03:13:22 +02:00
kent@mysql.com
eadd351031 make_win_src_distribution.sh: 
Include "sql_yacc.yy" for completeness (bug#20387)
 2006-06-17 03:04:43 +02:00
kent@mysql.com
ed6ff12315 Merge 2006-06-17 02:05:48 +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
kent@mysql.com
392bb51f25 configure.in, net_serv.cc, compile-netware-END: 
Changes for Netware
 2006-06-17 00:30:02 +02: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
kent@mysql.com
5a242ffc4f .del-mysql_install.def~8da659e7c0f7e571: 
Delete: netware/mysql_install.def
Makefile.am:
  Removed obsolete "mysql_install.def"
 2006-06-16 22:29:52 +02: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
msvensson@neptunus.(none)
104748ddaf Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-06-16 17:30:03 +02:00
msvensson@neptunus.(none)
0a15f9d0bf Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 2006-06-16 15:56:08 +02:00
ramil@mysql.com
8a4ff6374b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-16 16:51:07 +05:00
ramil@mysql.com
10914578f1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-16 16:43:44 +05:00
stewart@mysql.com
a145882944 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2006-06-16 21:36:17 +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
ramil@mysql.com
7e8a2ec6bb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-06-16 15:27:04 +05:00
ramil@mysql.com
f2899063ee after-merge fixes. 2006-06-16 14:05:58 +05:00
serg@serg.mylan
816bd73362 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2006-06-16 10:01:13 +02:00
serg@serg.mylan
16861b2e3b Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index 
Don't rely on table->null_row when no index is used - it may be a multi-table search
 2006-06-16 09:49:18 +02:00
igor@rurik.mysql.com
ee2e2d0c6d Post_merges fixes. 2006-06-15 20:29:05 -07: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
knielsen@mysql.com
061bdf919f BUG#19940: Add Valgrind suppression for false alarm report. 2006-06-15 22:02:26 +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
gluh@eagle.intranet.mysql.r18.ru
00fcdf8c00 Fix for bug#19667 group by a decimal expression yields wrong result 2006-06-15 16:24:02 +05:00
evgen@moonbone.local
d3502181c0 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/19789-bug-5.0-opt-mysql
 2006-06-15 15:01:37 +04:00
evgen@moonbone.local
b669852866 Merge moonbone.local:/work/15351-bug-4.1-mysql 
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
 2006-06-15 14:57:53 +04:00
ramil@mysql.com
26fa98a2cb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b15558
 2006-06-15 11:15:56 +05:00
evgen@moonbone.local
a2261d57be Many files: 
After merge fix
 2006-06-15 01:48:41 +04:00
msvensson@devsrv-b.mysql.com
94c9e172d8 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-06-14 22:14:59 +02:00
tomas@poseidon.ndb.mysql.com
476caec5ef Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-14 22:11:38 +02:00
tomas@poseidon.ndb.mysql.com
a2f91ba104 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-14 22:11:30 +02:00