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

35191 commits

This branch
This branch
All branches
Author SHA1 Message Date
evgen@moonbone.local
66371d22e2 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-06-20 20:13:37 +04:00
evgen@moonbone.local
75164ffc2f rpl_ndb_log.result: 
Fixed failing test case
 2006-06-20 20:11:08 +04:00
svoj@may.pils.ru
1c42c9730d Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-20 16:45:51 +05:00
kent@mysql.com
34d82f0bc6 make_win_src_distribution.sh: 
Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"
 2006-06-20 12:24:12 +02:00
kent@mysql.com
8f0aa436ed Merge 2006-06-20 11:11:18 +02:00
stewart@mysql.com
9edd7b3766 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-20 17:33:14 +10:00
stewart@mysql.com
9e05d61a48 BUG#20333 valgrind: mgmd event reporting dep on uninit value 2006-06-20 17:29:02 +10:00
stewart@mysql.com
0d7ea0acd4 fix test result after BUG#20073 fix 2006-06-20 14:24:52 +10:00
anozdrin@booka.site
f237fa7840 Merge mysql.com:/home/alik/MySQL/devel/5.1-tree 
into  mysql.com:/home/alik/MySQL/devel/5.1-rt
 2006-06-20 00:54:51 +04:00
serg@serg.mylan
d4bdf2f447 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 21:12:31 +02:00
evgen@sunlight.local
6e80c3ec42 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-06-19 22:23:41 +04:00
serg@serg.mylan
829772b49d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 19:14:14 +02:00
epotemkin@sunlight.local
b1ca33dbdb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-06-19 20:32:07 +04:00
evgen@moonbone.local
9c324f32e7 rpl_row_log.result, rpl_row_log_innodb.result: 
Fixed failing test case
 2006-06-19 20:21:00 +04:00
svoj@may.pils.ru
23a4a85908 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 20:01:24 +05:00
svoj@may.pils.ru
098c1a0303 Merge april:devel/BitKeeper/mysql-5.0-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 19:58:55 +05:00
svoj@may.pils.ru
6124539b0f Merge april:devel/BitKeeper/mysql-5.1-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
 2006-06-19 19:57:42 +05:00
stewart@mysql.com
917203ddd7 BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS, 2006-06-20 00:30:19 +10:00
svoj@may.pils.ru
2c28b3cbf1 Addition to fix for 
BUG#18036 - update of table joined to self reports table as crashed

Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
 2006-06-19 17:50:52 +05:00
serg@serg.mylan
6554329434 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-19 13:49:00 +02:00
anozdrin@mysql.com
7ecfadbcf2 Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN(). 2006-06-19 15:17:15 +04:00
svoj@may.pils.ru
8d802218fb Merge april:devel/BitKeeper/mysql-5.0-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:11:23 +05:00
svoj@may.pils.ru
6a90aede13 Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
 2006-06-19 16:06:29 +05:00
anozdrin@mysql.com
3b6397b1d2 WL#3298: IM: make command-line option names consistent 
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
 2006-06-19 14:41:29 +04:00
svoj@may.pils.ru
737e166403 Merge april:devel/BitKeeper/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
 2006-06-19 14:13:44 +05:00
svoj@may.pils.ru
37cdb0fbf3 BUG#18036 - update of table joined to self reports table as crashed 
Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.
 2006-06-19 14:05:14 +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