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
sergefp@mysql.com
5d3dc82daa
Change Item_arena::state to enum
2004-08-31 14:07:02 +04: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
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
sergefp@mysql.com
3dfbc35f45
Fix for BUG#5242: Made SQL Syntax Prepared Statement names case-insensitive.
2004-08-29 19:44:28 +04:00
paul@ice.snake.net
34dc3a86df
Minor edits to error messsage.
2004-08-28 13:07:47 -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
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
monty@mysql.com
91ec38a74e
merge
2004-08-26 00:39:43 +03:00
monty@mysql.com
4fccf1c4ac
Remove default argument to mysql_truncate()
...
Update to new valgrind
2004-08-26 00:37:25 +03:00
rburnett@build.mysql.com
358900236a
Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
...
sql_base.cc:
Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
2004-08-25 15:12:31 +02:00
rburnett@build.mysql.com
52a973c5ff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-25 06:39:19 +02:00
mskold@mysql.com
a2bcb2a558
Cleaned up rnd_init
2004-08-24 23:13:32 +02:00
serg@serg.mylan
19f7592206
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:03 +02:00
serg@serg.mylan
0dc5945b19
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 21:07:08 +02:00
konstantin@mysql.com
522a27069f
Merge: manual resolve
2004-08-24 23:07:08 +04:00
serg@serg.mylan
54520d9780
automerged
2004-08-24 18:22:33 +02:00
serg@serg.mylan
8f254c1b7b
followup
2004-08-24 18:20:27 +02:00
gluh@gluh.mysql.r18.ru
510cacbb77
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(for 4.1)
2004-08-24 20:18:59 +04:00
konstantin@mysql.com
ae18dc3ec8
Fix for Bug#5034 "prepared "select 1 into @arg15", second
...
execute crashes server": we were deleting lex->result
after each execute, but prepared statements assumed that
it's left intact.
The fix adds cleanup() method to select_result hierarchy,
so that result objects can be reused.
Plus we now need to delete result objects more wisely.
2004-08-24 20:17:11 +04:00
serg@serg.mylan
8f2d92c56a
manually merged
2004-08-24 17:24:23 +02:00
serg@serg.mylan
a302f88eb9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 17:24:05 +02:00
monty@mysql.com
46588eeb7a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-24 18:24:05 +03:00
monty@mysql.com
c44d4debfa
Portablity fixes & simple optimizations
2004-08-24 18:00:45 +03:00
serg@serg.mylan
50ee43be43
BDB: Bug#4531: unique key prefix interacts poorly with utf8,
...
Bug#4594 column index make = failed for gbk
2004-08-24 15:32:57 +02:00
gluh@gluh.mysql.r18.ru
1786a388e4
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(2nd version)
2004-08-24 17:29:08 +04:00
paul@kite-hub.kitebird.com
25266b845f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-24 07:22:16 -05:00
sergefp@mysql.com
908ff0495d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
2004-08-24 15:29:10 +04:00
sergefp@mysql.com
d970586fef
Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR
2004-08-24 14:44:15 +04:00
hf@deer.(none)
43a853dd4d
Merging
2004-08-24 12:58:21 +05:00
rburnett@build.mysql.com
95a51bca95
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-24 00:45:03 +02:00
monty@mysql.com
3808e4a5cf
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-24 01:09:24 +03:00
monty@mysql.com
7ff0cef3f1
Fixed uninitialized variable
...
Fixed error messages
2004-08-24 01:08:48 +03:00
rburnett@build.mysql.com
990c5857e5
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-23 22:01:16 +02:00
bell@sanja.is.com.ua
3b65ce7489
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:32:38 +03:00
bell@sanja.is.com.ua
6fcd27e9cd
after review fixes:
...
allowed parsing of table fields inside aggregate functions
added new tests of fields resolving in grouping
2004-08-23 22:31:01 +03:00
paul@kite-hub.kitebird.com
917aa465e2
mysqld.cc:
...
System variable names use underscores, not dashes.
Alphabetize variables in option struct for help message.
(will wait for okay to push)
2004-08-23 14:30:55 -05:00
rburnett@build.mysql.com
680aa3d69d
Bug #4629 Crash after SLAVE STOP, if the IO thread is in special state.
...
client.c:
Removed call to clear_slave_vio in end_server(). Removed header declaration of clear_slave_vio
slave.cc:
Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()
2004-08-23 18:55:12 +02:00
gluh@gluh.mysql.r18.ru
7b17daf21e
Fix for bug #5134 : WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree)
2004-08-23 20:17:14 +04:00
guilhem@mysql.com
7bfc78f573
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-23 17:16:22 +02:00
gluh@gluh.mysql.r18.ru
7ff0c3978c
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
2004-08-23 19:16:21 +04:00