monty@mysql.com
5d71817c70
After merge fixes
2004-09-05 02:31:11 +03:00
monty@mysql.com
9d8555c0f0
Merge with 4.0 to get latest bug fixes
2004-09-04 15:59:49 +03:00
serg@serg.mylan
9153fd2ae4
merged
2004-09-03 22:12:27 +02:00
serg@serg.mylan
9b0468bc96
BUG#5327 - mi_sort_index() of 2-level tree
2004-09-03 22:04:08 +02:00
konstantin@mysql.com
bdec2c603b
A fix for bug#4368 '"like" fails in PreparedStatement, crashes
...
server': the bug occurs when arguments of LIKE function are in
differentcharacter sets. If these character sets are compatible,
we create an item-converter. In prepared mode, this item
needs to be created in memory of current prepared statement.
2004-09-03 23:28:49 +04:00
ram@gw.mysql.r18.ru
f91ca0bd66
A fix (Bug #4980 : union statement with () union () order by produces wrong explain).
2004-09-03 19:59:29 +05:00
monty@mysql.com
bb4ccdb177
Remove extra '/' after mysql_real_data_home
...
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
2004-09-03 02:25:27 +03:00
monty@mysql.com
8547d98c88
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-02 16:58:01 +03:00
monty@mysql.com
dec44916c1
After merge fixes
2004-09-02 16:57:26 +03:00
ram@gw.mysql.r18.ru
c6b2b2f09d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
2004-09-02 16:25:32 +05:00
bar@mysql.com
f37df2fdcc
Bug#4338 mysql-test-run fails if compiled with non-latin1 character set
2004-09-02 12:34:27 +05:00
bell@sanja.is.com.ua
b57e68e6e0
fixed typo in group_concat printing (BUG#5161)
2004-09-01 21:32:24 +03:00
bar@mysql.com
153e18a252
Allow IN to convert arguments into Unicode in some cases.
2004-09-01 15:39:15 +05:00
monty@mysql.com
054cea4ca8
Merge with 4.0
2004-09-01 04:12:09 +03:00
monty@mysql.com
ba4d4ce97a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-01 02:13:35 +03:00
bell@sanja.is.com.ua
b02451c5bd
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1
2004-08-31 21:11:54 +03:00
bell@sanja.is.com.ua
2cf1234ba2
after review patch
2004-08-31 21:10:57 +03:00
mskold@mysql.com
ae801bad8d
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 15:53:28 +02:00
monty@mysql.com
7abae83300
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-31 16:53:25 +03:00
monty@mysql.com
6adaff23a4
Review of new pushed code (Indentation fixes and simple optimizations)
...
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files
2004-08-31 14:35:04 +03:00
sergefp@mysql.com
e4ffae2a0e
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames
2004-08-31 14:12:42 +04:00
mskold@mysql.com
84196617c1
Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert
2004-08-31 12:07:48 +02:00
mskold@mysql.com
b0bac7d1e0
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 10:20:51 +02:00
mskold@mysql.com
4f8a82dbfe
Enabled HA_NULL_IN_KEY support
2004-08-31 10:19:10 +02:00
mskold@mysql.com
4b1671c933
Simplified expensive test
2004-08-31 10:00:33 +02:00
serg@serg.mylan
49d49e2fcb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-30 16:32:10 +02:00
serg@serg.mylan
994d648dda
space-stripping in _mi_prefix_search: BUG#5284
2004-08-30 16:12:53 +02:00
lenz@mysql.com
9632f7d9c8
- removed mysql-test/t/flush_block_commit-master.opt as it collided
...
with the sleep value we use for the test suite run during the
release builds
2004-08-30 09:20:52 +02:00
sergefp@mysql.com
3dfbc35f45
Fix for BUG#5242: Made SQL Syntax Prepared Statement names case-insensitive.
2004-08-29 19:44:28 +04:00
monty@mysql.com
f574cd4e8f
Code style fixes.
...
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
2004-08-28 00:49:54 +03:00
joreland@mysql.com
cca01b0191
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 19:02:46 +02:00
bar@mysql.com
b604164599
Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict
2004-08-27 20:48:19 +05:00
bar@mysql.com
e8fcc297e1
grant.result:
...
Forgot to push in the previous changeset
2004-08-27 20:48:18 +05:00
joreland@mysql.com
f33207ac8d
Fix order by
2004-08-27 14:15:47 +02:00
joreland@mysql.com
e85ce08901
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 14:02:02 +02:00
ram@gw.mysql.r18.ru
3acccb988a
A fix (Bug #5232 : CREATE TABLE ... SELECT can deadlock itself).
2004-08-27 16:43:01 +05:00
bar@mysql.com
10b88b37b7
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-27 15:56:27 +05:00
bar@mysql.com
b10dcf7aa6
grant.result:
...
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
2004-08-27 15:55:16 +05:00
joreland@mysql.com
6df66180bd
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 01:01:47 +02:00
joreland@mysql.com
95e5b457b8
Fix ordered index scan with partially specified key
2004-08-27 00:59:16 +02:00
serg@serg.mylan
acbf96a161
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:49:16 +02:00
monty@mysql.com
ceba1429b7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-26 18:27:33 +03:00
monty@mysql.com
ea687ba5da
Portability fixes
...
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
serg@serg.mylan
b4bb38e896
merged
2004-08-26 15:19:46 +02:00
ram@gw.mysql.r18.ru
2a29cb0204
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 16:54:33 +05:00
ram@gw.mysql.r18.ru
2133721ac6
A fix (Bug#5219: Cannot use '||' with MBRContains(..)).
2004-08-26 16:51:26 +05:00
bar@mysql.com
87537752e2
"SELECT BINARY x" now means "SELECT CAST(x AS BINARY)".
2004-08-26 16:31:37 +05:00
rburnett@build.mysql.com
1e0e96a0d2
Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
...
lowercase_table.result:
New results for modified lowercase_table test
lowercase_table.test:
Added test case for all uppercase database when running under lower_case_table_names. This really only failed under Windows. Bug# 4792
2004-08-25 17:25:38 +02:00
mskold@mysql.com
a2bcb2a558
Cleaned up rnd_init
2004-08-24 23:13:32 +02:00
serg@serg.mylan
1538c318c9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:37:04 +02:00