Commit graph

613 commits

Author SHA1 Message Date
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
74d8113c2e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 22:02:33 +02:00
msvensson@neptunus.(none)
e0985bef96 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
ac5b37ef00 Pass --core-file option to mysqld when bootstrapping 2006-10-24 21:02:04 +02:00
msvensson@neptunus.(none)
1a7676fa65 WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
BUG#23427 incompatible ABI change in 5.0.26?
   - Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
2006-10-24 20:32:07 +02:00
jpipes@shakedown.(none)
b57051381a Fix for Bug #21412 (client allows DELIMITER with backslash character) 2006-10-02 11:45:48 -04:00
msvensson@neptunus.(none)
8ee337a590 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-28 11:05:28 +02:00
msvensson@neptunus.(none)
3f59918eab Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 10:39:55 +02:00
msvensson@neptunus.(none)
c4a50dea3f Build fixes for netware/ directory
- Create the file netware/libmysql.imp from libmysql/libmysql.def
 - Remove the outdated netware/libmysql.imp file from version control
2006-09-27 17:11:19 +02:00
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-21 20:31:35 +02:00
istruewing@chilla.local
1782889d35 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-20 08:33:46 +02:00
istruewing@chilla.local
c49c58cbf4 Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty
into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty
2006-09-19 14:33:29 +02:00
istruewing@chilla.local
5d509b32d4 Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
2006-09-19 11:27:00 +02:00
istruewing@chilla.local
47dc3fbe8a Merge bk-internal:/home/bk/mysql-4.0
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-19 10:17:25 +02:00
msvensson@shellback.(none)
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 11:34:07 +02:00
msvensson@shellback.(none)
0a59967cb0 Remove trailing whitespace
Add linebreak
2006-09-18 11:27:21 +02:00
ramil/ram@myoffice.izhnet.ru
8445f3e3de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
2006-09-15 14:15:09 +05:00
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-09-14 23:53:35 +04:00
iggy@rolltop.ignatz42.dyndns.org
e9ff111d1e Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-13 14:18:36 -04:00
iggy@rolltop.ignatz42.dyndns.org
eb641f4a43 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 14:16:53 -04:00
iggy@rolltop.ignatz42.dyndns.org
1cae186141 These bitKeeper changes will allow Windows to be used as a primary development platform. 2006-09-13 14:15:22 -04:00
msvensson@shellback.(none)
a63285a647 Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
into  shellback.(none):/home/msvensson/mysql/mtr/my51-mtr
2006-09-01 10:32:20 +02:00
msvensson@shellback.(none)
7afee46c55 Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr
into  shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
2006-09-01 10:25:50 +02:00
msvensson@shellback.(none)
324cf4ccb3 Add target to make "mtr", shortcut for running test suite 2006-09-01 10:21:08 +02:00
cmiller@zippy.cornsilk.net
05df2f9402 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
2006-08-23 18:37:04 -04:00
cmiller@zippy.cornsilk.net
2a06452bde Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-23 18:29:44 -04:00
cmiller@zippy.cornsilk.net
a4f32ff2e8 String broken up to avoid silly MICROS~1 string-size limit. 2006-08-23 18:29:05 -04:00
andrey@example.com
53089a19d9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337
into  example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
monty@mysql.com/narttu.mysql.fi
7d0b042ec5 Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
The previous bug fix didn't work when using partial keys.
Don't use GNUC min/max operations are they are depricated.
Fixed valgrind warning
2006-08-10 22:41:19 +03:00
kostja@bodhi.local
12051070a7 Fix a bug in the .dsp file. Ignore a symlink. 2006-08-04 00:00:48 +04:00
kostja@bodhi.local
73189969f3 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-26 23:33:25 +04:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 22:09:36 +04:00
andrey@lmy004.
3f6de6c523 update to ease the patch process 2006-07-13 16:24:55 +02:00
andrey@lmy004.
2319aac01e Manual merge 2006-07-10 14:42:29 +02:00
kostja@bodhi.local
a2c0cdd75b Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
2006-07-08 02:30:07 +04:00
kostja@bodhi.local
96f4c10dde Cleanups: ignore more files. 2006-07-08 00:03:43 +04:00
bar@mysql.com
3855520138 WL#2928 Date Translation NRE
(implemented by by Josh Chamas)
2006-07-04 17:40:40 +05:00
cmiller@zippy.(none)
6110a83a0e Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-03 11:35:58 -04:00
monty@mysql.com
f62829636b After merge fixes 2006-06-30 20:07:33 +03:00
monty@mysql.com
3f22bc07c6 Fixed failing test rpl_ndb_auto_inc.test
Mark events_stress.test as 'big' as it's very slow on some machines
2006-06-29 03:24:33 +03:00
monty@narttu.mysql.fi
91c3e28d77 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-28 20:03:46 +03:00
monty@mysql.com
500dd048b9 Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex" 2006-06-28 17:23:54 +03:00
andrey@lmy004.
04659677a8 WL#3337 (Events new infrasctructure)
Second cut of separating parsing phase from execution phase
Separate Event_timed from parsing phase and introducing Event_parse_data.
2006-06-27 10:53:26 +02:00
cmiller@zippy.(none)
deca07bdcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-06-20 17:17:04 -04:00
andrey@lmy004.
45598df7d4 manual merge 2006-06-20 17:14:36 +02:00
cmiller@zippy.(none)
00243ac847 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-06-13 16:06:35 -04:00
andrey@lmy004.
1d1e9d10b6 Reorganize, physically the events code
Unify method naming -> create/update/drop_event
Move class Event_timed to event_timed.h
class Events is in events.h (renamed from event.h)
The implementation is in events.cc (renamed from event.h)
2006-06-08 23:07:11 +02:00
anjuta@arthur.local
a885c2e6f2 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into  arthur.local:/home/my/mysql-5.0
2006-06-05 12:19:53 +03:00
monty@mysql.com
c46fb742b8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-06-04 21:05:22 +03:00