ram@gw.mysql.r18.ru
c9d97272ed
A fix (Bug #5291 : float -> string, truncation, sometimes without warning).
2004-09-03 19:38:16 +05:00
monty@mysql.com
936eb4b4f4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-03 02:26:00 +03: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
konstantin@mysql.com
2f191db2b1
A fix and test case for Bug#4231 "Wrong result with MYSQL_TIME
...
parameters": when unpacking binary time recieved from client, handle
the case when length is 0: it means all MYSQL_TIME members are zero.
2004-09-02 20:16:01 +04: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
hf@deer.(none)
21acb551ab
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-02 11:11:16 +05:00
hf@deer.(none)
5a817ea665
Addition to the fix for #4815
2004-09-02 11:10:26 +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
bar@mysql.com
4f32cd2b3d
Move collation aggregation with superset conversion code
...
from Item_bool_func2 into DTCollation to make it reusable
for other types of items.
2004-09-01 13:56:33 +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
ram@gw.mysql.r18.ru
b93a973b12
Added global my_getopt_error_reporter function pointer which is
...
used in the handle_options() function (instead of using additional
handle_option() parameter). The default value of the
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05: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
bar@mysql.com
34688d710c
Better easier to call error message format.
2004-08-31 18:53:27 +05: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
sergefp@mysql.com
5d3dc82daa
Change Item_arena::state to enum
2004-08-31 14:07:02 +04: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
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
079678be7b
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-30 10:17:51 +02:00
serg@serg.mylan
38d9ce96f9
typo fixed
2004-08-30 10:13:13 +02:00
serg@serg.mylan
b60713c033
bug in my_strnncoll_utf8 (and friends) fixed
...
cleanups
better, charset-dependent, ft_max_len_for_sort value
2004-08-30 08:37:36 +02:00
rburnett@build.mysql.com
547b46b7c9
log.cc:
...
Fixed missing * in comment in setup_windows_event_source
2004-08-30 00:50:39 +02:00
bell@sanja.is.com.ua
18366c930c
NOT elimination moved in parsing (suggested by Monty)
2004-08-29 23:14:46 +03: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
guilhem@mysql.com
0485e5d3f0
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-29 14:14:32 +02:00
guilhem@mysql.com
93101561fd
Fix for BUG#4500 "set character set replicates incorrectly"
...
We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.
2004-08-29 14:13:51 +02:00
paul@ice.snake.net
34dc3a86df
Minor edits to error messsage.
2004-08-28 13:07:47 -05: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
bar@mysql.com
4d1dedd70d
Compile all charset conversion tables if --with-extra-charsets=all
...
or --with-extra-charsets=complex is given.
2004-08-27 21:17:29 +05: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
5258ea12cf
table.cc:
...
Bug #4558 Escape handling error for ENUM values in SJIS encoding
2004-08-27 12:09:28 +05:00
bar@mysql.com
43b792d5cf
win1251.conf:
...
Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
bug#5110
2004-08-27 10:54:57 +05:00
serg@serg.mylan
08f3ba0e29
after merge
2004-08-26 18:22:22 +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
49868b9fd4
Should check for GEOM_FLAG later because keyX may be partly initialized (min_flag is not set).
2004-08-26 17:43:08 +05: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
rburnett@build.mysql.com
0e44c9fdab
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-26 13:43:27 +02:00
bar@mysql.com
87537752e2
"SELECT BINARY x" now means "SELECT CAST(x AS BINARY)".
2004-08-26 16:31:37 +05:00