Commit graph

1260 commits

Author SHA1 Message Date
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
anozdrin/alik@alik.
f564e7f8a5 This is another patch for test suite to make IM tests work smoothly.
The patch affects only test suite and has the following changes:

1. On starting Instance Manager -- added code for waiting for guarded
mysqld instances to create PID files;
2. Polishing;
3. Move IM-related operations out of mtr_process.pl into new dedicated
for IM file -- mtr_im.pl
2006-09-08 16:19:19 +04:00
msvensson@shellback.(none)
c79635853a Speed up "bk citool" for msvensson: 2006-09-08 11:25:08 +02:00
kostja@bodhi.local
ebb7070430 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-30 03:00:19 +04:00
anozdrin/alik@alik.
1a7cb4153c Preliminary patch for the following bugs:
- BUG#15934: Instance manager fails to work;
  - BUG#18020: IM connect problem;
  - BUG#18027: IM: Server_ID differs;
  - BUG#18033: IM: Server_ID not reported;
  - BUG#21331: Instance Manager: Connect problems in tests;

The only test suite has been changed
(server codebase has not been modified).
2006-08-29 15:46:40 +04:00
anozdrin/alik@alik.
7121f5b351 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt-bug16899
2006-08-25 13:37:07 +04:00
anozdrin/alik@alik.
9af756efd3 Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
User name (host name) has limit on length. The server code relies on these
limits when storing the names. The problem was that sometimes these limits
were not checked properly, so that could lead to buffer overflow.

The fix is to check length of user/host name in parser and if string is too
long, throw an error.
2006-08-23 21:31:00 +04:00
kroki/tomash@moonlight.intranet
aca2c3761a Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-10 16:11:55 +04:00
georg@lmy002.wdf.sap.corp
5f5c7bade3 Bug #21396: Wrong error number generated for a missing table 2006-08-02 10:00:28 +02:00
pekka@clam.ndb.mysql.com
225f070788 pekka - checkout:get (4.1) 2006-07-04 13:51:35 +02:00
knielsen@mysql.com
6d40321bac Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. 2006-06-09 08:40:21 +02:00
knielsen@mysql.com
acf3a19382 Add trigger to protect against changesets from crashed tree 2006-06-08 17:37:43 +02:00
pekka@mysql.com
2b25349820 pekka:get - push push push 2006-05-02 21:47:53 +02:00
rburnett@production.mysql.com
a630375b32 post-commit:
Small change to enable sending of mails from Windows bk clones
2006-03-13 16:16:46 +01:00
pekka@mysql.com
425553e066 add myself to checkout:get (should be default for all) 2006-01-25 22:49:31 +01:00
pem@mysql.com
8e0e421943 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-07 15:17:18 +01:00
lenz@mysql.com
cf7e2b2d6d Merge mysql.com:/space/my/mysql-4.1
into  mysql.com:/space/my/mysql-5.0-merg
2005-12-07 10:40:26 +01:00
lenz@mysql.com
74f44b9b9a Merge mysql.com:/space/my/mysql-4.0
into  mysql.com:/space/my/mysql-4.1
2005-12-07 06:46:43 +01:00
lenz@mysql.com
d4a1aab217 - commit emails are now sent to commits@lists.mysql.com instead of
internals@lists.mysql.com to reduce the noise on the internals list.
2005-12-06 14:07:23 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
guilhem@mysql.com
4252b546b3 Merge mysql.com:/home/mysql_src/mysql-4.1
into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
2005-10-12 21:58:02 +02:00
guilhem@mysql.com
e6043231ea Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and speeding up 'bk citool' for me 2005-10-04 22:24:04 +02:00
ndbdev@dl145b.mysql.com
46cc62e216 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-09 15:26:47 +02:00
aivanov@mysql.com
2165167200 Merge mysql.com:/home/alexi/dev/mysql-4.1-0
into  mysql.com:/home/alexi/dev/mysql-5.0-0
2005-09-06 23:49:54 +04:00
lenz@mysql.com
ec61094daf - removed the commercial BK license key from BitKeeper/etc/config to be able to push the
repository to bkbits.net (License keys should not be put into the repository!)
2005-09-05 09:41:18 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
tomas@poseidon.ndb.mysql.com
0c859d6651 config:
updated tomas default checkout
2005-08-25 13:15:29 +02:00
tomas@poseidon.ndb.mysql.com
90778fc857 config:
changed tomas default checkout
2005-08-25 13:04:53 +02:00
jonas@eel.(none)
e449bfed9d jonas:
fix bk checkout properties
2005-08-19 10:24:37 +02:00
jonas@eel.(none)
24be1c1524 jonas -
Fix checkout properties
2005-08-19 09:04:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64 Faster alter table code for 5.1. 2005-07-22 23:43:59 +03:00
tomas@poseidon.ndb.mysql.com
9743190cd9 no open logging
adopted perl test script for new dir structure
2005-07-12 13:51:25 +02:00
lenz@mysql.com
36ddf47bed Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-07-06 08:50:22 +02:00
lenz@mysql.com
ddca379b87 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build
2005-07-05 19:53:35 +02:00
lenz@mysql.com
eaac485b17 - disabled openlogging to satisfy BK when using a commercial license key 2005-07-05 17:09:56 +02:00
marty@flipper.bredbandsbolaget.se
eb729f9a29 Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0
into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1
2005-06-23 10:58:37 +02:00
ndbdev@dl145b.mysql.com
be1177c15b merge 2005-06-14 00:05:27 +02:00
tulin@dl145c.mysql.com
e08993f069 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-06-13 20:40:53 +02:00
tulin@dl145c.mysql.com
57ddf5223f logging_ok:
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
2005-06-13 19:45:15 +02:00
igor@igor-inspiron.creware.com
750fca61f9 ctype_utf8.test, ctype_utf8.result:
Added a test case for bug #11167.
sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes
2005-06-13 06:10:19 -07:00
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30 merge 2005-06-13 08:05:29 +02:00
obarnir@mysql.com
156d351e1d Adding auxiliary scripts that allow to display messages in result files from within test files
- show_msg.inc   - displays a message followed by a line of '-' at the length of the messgae
 - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80
2005-06-09 11:01:23 -07:00
igor@rurik.mysql.com
c963b12fd3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 06:38:05 -07:00
elliot@mysql.com
2a1f5c0748 Accepted openlogging 2005-06-07 05:10:18 -04:00
mronstrom@mysql.com
6a376bec64 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/Users/mikron/bug10901
2005-06-06 10:42:11 +02:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4 Merge 2005-06-04 19:26:35 +02:00