iggy@rolltop.ignatz42.dyndns.org
1528d04fea
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-14 11:05:27 -04:00
iggy@rolltop.ignatz42.dyndns.org
7c0c57d694
/usr/sbin not always in PATH environment variable.
2006-09-14 10:57:00 -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
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
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
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
pekka@mysql.com
2b25349820
pekka:get - push push push
2006-05-02 21:47:53 +02: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
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
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
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
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
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
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
mronstrom@mysql.com
96252c1de9
Bug #10901
...
Analyze table corrupts the state on
data_file_length, records, index_file_length...
by writing the shared state when there is an updated internal
state due to inserts or deletes
Fixed by synching the shared state with the internal state before
writing it to disk
Added test cases of 2 error cases and a normal case in new
analyze test case
2005-06-03 17:13:43 +02:00
ndbdev@dl145b.mysql.com
25cb14234a
sql_repl.cc:
...
Bug #11064 some read error not detected in replication on 64-bit platform
2005-06-03 11:16:37 +02:00
reggie@monster.
0e139b8908
Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0
2005-06-02 12:36:55 -05:00
reggie@monster.
7b9d4eaa92
fixed compile problem by replacing W_OK with F_OK
2005-06-02 11:12:58 -05:00
igor@igor-inspiron.creware.com
186e8c5891
item_func.h:
...
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
Item_func_coalesce and Item_func_ifnull now
inherit from a modified Item_func_numhybrid.
case.test, case.result:
Added test cases for bug #9939 .
2005-06-02 07:27:02 -07:00
patg@radha.local
a6af23a046
changes to fix joins not working (bug #10848 ). New tests, as well as table->status being set in index_read_idx
2005-05-25 02:15:09 +02:00
gbichot@bk-internal.mysql.com
a49ccfe6f0
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0
2005-05-24 00:31:28 +02:00
gbichot@bk-internal.mysql.com
76a20eb397
marking the file gone again to hopefully get the tree on its feet
2005-05-23 23:54:39 +02:00
jimw@mysql.com
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
schwenke@lmy003.wdf.sap.corp
badfc2e4a9
new build scripts for SAP team
2005-05-18 15:28:51 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3
ndberror.c:
...
updated error message for ndb
2005-05-18 10:22:27 +02:00
bell@book.sanja.is.com.ua
1ff9f55920
relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020)
2005-05-16 12:19:10 +03:00
serg@serg.mylan
40ce1e174d
merged
2005-05-14 19:28:29 +02:00
konstantin@mysql.com
e5c916f7e8
Merge
2005-05-13 13:26:08 +02:00
konstantin@mysql.com
441379ceab
Add myself to the list of users who don't automatically check out
...
all version controlled files (should speed up bk citool)
2005-05-13 11:35:02 +04:00
holyfoot@hf-ibm.(none)
1851a38b2f
Fix for bug #10493 (SJIS fields are not correctly saved)
2005-05-10 02:15:59 +05:00
mskold@mysql.com
9e1117c3e5
Merge
2005-05-08 22:52:55 +02:00
mwagner@ultrafly.mysql.com
b0774772d9
errmsg.txt:
...
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195 ).
2005-05-08 19:14:28 +02:00
mwagner@ultrafly.mysql.com
9f92bd5e25
Merge bk-internal:/home/bk/mysql-4.0
...
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0
2005-05-07 22:08:05 +02:00
svoj@mysql.com
f0841a2771
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0
2005-05-07 21:39:29 +05:00
joerg@trift-lap.fambruehe
84af50133b
Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB).
2005-05-07 18:06:02 +02:00
jimw@mysql.com
17b6789cf2
Merge
2005-05-07 08:35:55 -07:00
mwagner@ultrafly.mysql.com
ded73eddf7
errmsg.txt:
...
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195 ).
2005-05-07 15:11:31 +02:00
svoj@mysql.com
c7f0fcab23
BUG#7709 fix - Boolean fulltext query against unsupported engines does not
...
fail.
2005-05-07 15:48:56 +05:00
gbichot@production.mysql.com
a1948f769c
[backport of 4.1, because 4.0 autobuild now hits the same problem;
...
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
2005-05-07 11:35:14 +02:00
antony@ltantony.mysql.com
521b0b6d76
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
...
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
2005-05-07 08:46:42 +01:00
antony@ltantony.mysql.com
67bcc9707f
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616
...
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
2005-05-06 16:16:05 +01:00
antony@ltantony.mysql.com
bf17b75a28
Bug#6616
...
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
Infinite loop caused by missing update to thd version.
2005-05-06 14:42:28 +01:00
rburnett@bk-internal.mysql.com
ad6de2c05a
Merge bk-internal.mysql.com:/users/rburnett/bug9721
...
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/users/rburnett/bug9721
2005-05-06 15:10:01 +02:00
jani@ibmlab.site
0e91a7131f
Merge ibmlab.site:/home/my/bk/mysql-4.1
...
into ibmlab.site:/home/my/bk/mysql-5.0
2005-05-06 13:42:30 +03:00
jani@ibmlab.site
fa25b9b49d
A fix for Bug#8467.
2005-05-06 12:18:37 +03:00
bar@mysql.com
b1431c222a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/root/mysql-5.0
2005-05-06 13:08:28 +05:00
bar@mysql.com
1f14cfcb35
merging cp932 from 4.1
2005-05-06 12:00:25 +05:00
ramil@mysql.com
802360fbc2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/5.0
2005-05-06 08:34:50 +05:00
shuichi@mysql.com
f0fb08dd79
Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46
Added cp932 character set
2005-05-05 10:36:17 -07:00
rburnett@bk-internal.mysql.com
e7d7c0f236
Bug #9721 net_write_timeout not used on Windows
...
Added an extra parameter to all calls to timeout().
1 means we want to set the write timeout
0 means we wnat to set the read timeout
viossl.c:
Add which parameter to ssl timeout routine
vio_priv.h:
Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
Add which parameter to vio_timeout sigs
net_serv.cc:
Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
Set the appropriate timeout in vio_timeout
2005-05-05 17:17:57 +02:00
holyfoot@mysql.com
556504287b
Merge
2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232
A lot of fixes to Precision math
...
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
ram@ram-book.(none)
65f5a15a2d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ram-book.(none):/home/ram/work/5.0
2005-05-05 19:22:33 +05:00
ramil@ram-book.(none)
b9ccbfd1f3
A fix (bug #10179 : error in default value setting).
2005-05-05 17:17:55 +05:00
konstantin@mysql.com
753959cd88
Manual merge
2005-05-05 13:47:09 +04:00
tulin@dl145b.mysql.com
ccac26a27a
logging_ok:
...
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
BUG#10287
2005-05-04 10:16:03 +02:00
bell@book.sanja.is.com.ua
3be81d4299
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
2005-05-03 18:47:53 +03:00
monty@mysql.com
28a5491d3d
Merge with 4.1
2005-04-30 09:46:08 +03:00
evgen@moonbone.local
b11705a2b0
Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
...
Reset old error if tmp table was successfully created.
Test data is large and can be found in bug report along with test query.
2005-04-29 21:19:39 +04:00
geert@kriem.kemuri.org
2c36f4c821
Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-09 10:55:38 +02:00
acurtis@xiphis.org
dcc40a080d
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1
...
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
2005-04-09 00:36:08 +01:00
acurtis@xiphis.org
e82edda6c6
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
...
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
2005-04-08 21:40:50 +01:00
geert@kriem.kemuri.org
dd1f0267ad
Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-08 14:11:22 +02:00
gluh@mysql.com
decfc86fbb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables
2005-04-06 14:13:06 +05:00
serg@serg.mylan
ea673c1afd
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-05 19:52:22 +02:00
serg@serg.mylan
4962ba7f8a
merged
2005-04-05 19:44:39 +02:00
geert@kriem.kemuri.org
8c42aceb0a
Adding --show-warnings option for the mysql command line tool so warnings,
...
if any, are shown after execution of a statement in both batch and
interactive mode.
In interactive mode \w means show the warnings and \W means don't
show the warnings.
2005-04-05 15:30:17 +02:00
serg@serg.mylan
3c3defaa0a
add changeset key to the bk commit mail
2005-04-05 15:16:15 +02:00
gluh@eagle.intranet.mysql.r18.ru
fed0ba272a
Code optimization(discussed with Monty)
2005-04-05 14:31:46 +05:00
gluh@eagle.intranet.mysql.r18.ru
f1773668a8
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344
2005-04-04 12:12:50 +05:00
magnus@msdesk.mysql.com
e8434aadca
BUG#8585 ndb_cache2
...
- When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
2005-03-31 14:33:50 +02:00
gluh@eagle.intranet.mysql.r18.ru
1f38b5bdd1
Fix for bug #9344 INFORMATION_SCHEMA, wrong content, numeric columns
...
The columns CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH
of INFORMATION_SCHEMA.COLUMNS must be NULL for numeric columns
2005-03-31 13:44:42 +05:00
kent@mysql.com
bb713b13df
Do-compile:
...
Added option --with-big-tables
2005-03-30 02:41:08 +02:00
pekka@mysql.com
727015dbb3
Merge
2005-03-28 23:06:19 +02:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732
Merge
2005-03-25 10:43:35 +04:00
serg@serg.mylan
091f069671
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-23 21:10:01 +01:00
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01:00