monty@mishka.local
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
marko@hundin.mysql.fi
774916a902
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-07-04 16:12:08 +03:00
monty@mysql.com
5b8683db74
After merge fixes
2005-07-04 16:01:04 +03:00
monty@mysql.com
fe30ec9032
manual merge
2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
75ff7d8085
After merge fixes
...
Better fix for ON DUPLICATE KEY UPDATE
2005-07-04 03:24:25 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
2941da3971
do not register changes of stack variable
2005-07-03 00:51:02 +03:00
monty@mysql.com
62173c5a9d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-07-02 20:18:43 +03:00
monty@mysql.com
2735d7dcf6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-07-02 16:13:35 +03:00
bell@sanja.is.com.ua
6201504db9
fixed difference between ps-protocol and usual execution
2005-07-02 13:16:30 +03:00
kent@mysql.com
a06c4692f5
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-02 02:07:26 +02:00
kent@mysql.com
22fd02d157
configure.in:
...
Enable build with CXX=gcc and gcc version 4
2005-07-02 02:00:56 +02:00
kent@mysql.com
4cea53dd7d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-02 01:49:22 +02:00
heikki@hundin.mysql.fi
8bc2fbb0f8
row0sel.c:
...
Optimize speed: no need to keep track of set new rec locks in a consistent read
2005-07-02 00:39:47 +03:00
heikki@hundin.mysql.fi
a9cf7ad0d1
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-07-01 23:16:28 +03:00
heikki@hundin.mysql.fi
44c0f57d53
trx0trx.h, trx0trx.ic, row0mysql.c:
...
Fix another bug in the fix of Bug #3300
2005-07-01 22:53:08 +03:00
heikki@hundin.mysql.fi
50eab8cf01
trx0trx.ic, trx0trx.h:
...
Fix bug in the Bug #3300 bug fix
2005-07-01 21:06:23 +03:00
heikki@hundin.mysql.fi
4fe03b705a
Many files:
...
Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
2005-07-01 20:44:35 +03:00
bell@sanja.is.com.ua
17ef6b7d77
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-4.1
2005-07-01 20:14:55 +03:00
bell@sanja.is.com.ua
b6dc32a755
fixed create_distinct_group() to make references via ref_pointer_array
2005-07-01 20:13:07 +03:00
svoj@mysql.com
a834b69259
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/yassl1-mysql-5.0
2005-07-01 21:40:57 +05:00
pem@mysql.com
549399ee9e
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-01 17:01:03 +02:00
konstantin@mysql.com
88603a0edc
Fix a crash I introduced by the last push.
2005-07-01 19:01:02 +04:00
svoj@mysql.com
9359cec4ca
WL#2286 - Compile MySQL w/YASSL support
...
Merge with latest yaSSL. It includes fix for bigendian/littleendian
problem (fixes func_encrypt test failure). Our trees are in sync now.
2005-07-01 20:00:59 +05:00
pem@mysql.com
9f1bb68b77
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-01 16:13:36 +02:00
msvensson@neptunus.(none)
23f964b9e6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-01 16:11:30 +02:00
pem@mysql.com
8a85dcd1cc
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-01 15:52:42 +02:00
konstantin@mysql.com
f09b4b969c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-11172-new
2005-07-01 17:52:41 +04:00
konstantin@mysql.com
402df62bf7
Fix a valgrind warning.
2005-07-01 17:51:04 +04:00
igor@rurik.mysql.com
b46b232f3f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-07-01 06:42:39 -07:00
msvensson@neptunus.(none)
ead7b076dc
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-01 15:40:42 +02:00
msvensson@neptunus.(none)
11d3c28575
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0
Win port fixes
2005-07-01 15:39:36 +02:00
pem@mysql.com
481bb717d7
Disabled the GOTO feature. (It's non-standard and undocumented.)
...
We want to have the defacto standard syntax for labels ("L:" instead of "label L;"),
and fix some known bugs, before we enable this again.
The code is left intact (#ifdef'ed SP_GOTO) and the test cases are kept in
sp-goto.test, for the future...
2005-07-01 15:25:51 +02:00
konstantin@mysql.com
d8fef65119
tests/mysql_client_test.c
...
Add a test case for Bug#11656 "Server crash with mysql_stmt_fetch
(cursors)", the bug itself is no longer present.
2005-07-01 17:11:39 +04:00
konstantin@mysql.com
b590f0dec0
- fix -ansi -pedantic error
2005-07-01 16:23:05 +04:00
konstantin@mysql.com
6cc847d0e8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-11172-new
2005-07-01 15:50:32 +04:00
konstantin@mysql.com
0efa6f86be
A fix and a test case for Bug#11172 "mysql_stmt_attr_set
...
CURSOR_TYPE_READ_ONLY date/datetime filter server crash".
The fix adds support for Item_change_list in cursors (proper rollback
of the modified item tree).
2005-07-01 15:47:45 +04:00
igor@rurik.mysql.com
3d06031887
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-01 03:50:48 -07:00
bar@mysql.com
cff1c9c3af
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-01 15:46:53 +05:00
igor@rurik.mysql.com
347687f71e
view.result:
...
Fixed the results of a test for group_concat.
After the fix foor bug #11639 the results became
correct.
olap.result, olap.test:
Added a test case for bug #11639 .
sql_select.cc:
Fixed bug #11639 : a wrong result set when using a view
instead of the underlying table in a rollup query
executed through filesort.
The old code did not take into account that we always
use an Item_ref object when referring to a view column.
item.h:
Fixed bug #11639 .
Now if two Item_ref items ref1 and ref2 refer to the same field
then ref1->eq(ref2) returns 1.
2005-07-01 03:46:08 -07:00
bell@sanja.is.com.ua
faebc3148f
fix bugs found by gcc 3.4 compiler
2005-07-01 13:27:23 +03:00
marko@hundin.mysql.fi
4eba989290
InnoDB: Optimize [and clarify] a condition in build_template()
2005-07-01 13:20:16 +03:00
bar@mysql.com
48f34a0bc5
sql_table.cc:
...
Bug#11657 Creation of secondary index fails:
If TINYBLOB key part length is 255, it is equal
to field length. For BLOB, unlike for CHAR/VARCHAR,
we should keep a non-zero key part length, otherwise
"BLOB/TEXT column used in key specification without a key length"
error is produced afterwards.
type_blob.result, type_blob.test:
fixing tests accordinly
2005-07-01 15:07:06 +05:00
monty@mysql.com
3d02b808ba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-07-01 10:07:01 +03:00
monty@mysql.com
e3a4c1a6b2
Optimization during review
...
Add extra check to delete [] to ensure we are not deleting not allocated data
2005-07-01 09:40:05 +03:00
bell@sanja.is.com.ua
a921d083cb
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
2005-07-01 07:06:26 +03:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
msvensson@neptunus.(none)
ba2a0328d1
Tests readded for bug 10927
2005-06-30 20:44:31 +02:00