Commit graph

35327 commits

Author SHA1 Message Date
bar@bar.intranet.mysql.r18.ru
f3bda9b73f Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201
into  mysql.com:/usr/home/bar/mysql-5.1-kt
2006-06-19 11:18:05 +05: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
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
evgen@moonbone.local
79c91f6214 Manually merged 2006-06-18 14:56:35 +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
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
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
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
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
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
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
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
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
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
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
dlenev@mysql.com
59d20e26d5 Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and
INSERT triggers".

In cases when REPLACE was internally executed via update and table had
on update (on delete) triggers defined we exposed the fact that such
optimization used by callng on update (not calling on delete) triggers.
Such behavior contradicts our documentation which describes REPLACE as
INSERT with optional DELETE.

This fix just disables this optimization for tables with on delete triggers.
The optimization is still applied for tables which have on update but have
no on delete triggers, we just don't invoke on update triggers in this case
and thus don't expose information about optimization to user.

Also added test coverage for values returned by ROW_COUNT() function (and
thus for values returned by mysql_affected_rows()) for various forms of
INSERT.
2006-06-16 20:21:25 +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
serg@serg.mylan
c4dd4a398b remove wrong assert 2006-06-16 16:26:30 +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
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
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@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
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
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
mats@mysql.com
a424aa339e Fixes in tests for Replication/Backup Team Tree. 2006-06-16 11:10:37 +02:00