bar@bar.mysql.r18.ru
de9ba3848c
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-04 18:12:59 +05:00
bar@bar.mysql.r18.ru
0c2041cfdf
New methods
...
Item_func::agg_arg_collations()
Item_func::arr_arg_collations_for_comparison()
to aggregate argument collations.
It helps to reuse a lot of code.
2003-07-04 18:12:23 +05:00
serg@serg.mylan
647dbdf611
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-04 13:13:17 +02:00
ram@mysql.r18.ru
2d350a1de0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-07-04 15:39:57 +05:00
serg@serg.mylan
7fbc7d3022
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-04 12:07:49 +02:00
serg@serg.mylan
4aac5d9938
enabling HA_READ_PREFIX_LAST_OR_PREV
2003-07-04 12:07:06 +02:00
ram@mysql.r18.ru
2927f2a293
fix and test case for the bug #787 : HANDLER without INDEX doesn't work with deleted rows
2003-07-04 14:41:01 +05:00
monty@narttu.mysql.fi
110b497cc3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-07-04 01:57:56 +03:00
monty@narttu.mysql.fi
42e5754a4b
Fixed problem with stacksize on Unixware
2003-07-04 01:21:42 +03:00
bar@bar.mysql.r18.ru
4d856e01f3
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-03 19:25:19 +05:00
bar@bar.mysql.r18.ru
d1607a11fe
FIELD() now takes in account arguments collations
2003-07-03 19:24:38 +05:00
bell@sanja.is.com.ua
309480f5b3
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-07-03 15:25:20 +03:00
bell@sanja.is.com.ua
0f0a0f95ad
fixed typo in previous fix
2003-07-03 15:25:00 +03:00
bar@bar.mysql.r18.ru
07f94cb7cd
Row comparison now does compare field collations, e.g.
...
ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
When a number is compared to a string, character sets and
collations are not aggregated. e.g. this returned error in 4.1.0:
SELECT 1=_latin2'1';
because character sets was aggregated, and 1 was considered as
a string of latin1 charset during this aggregation.
2003-07-03 17:00:01 +05:00
monty@narttu.mysql.fi
6a9a3ec0eb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-07-03 14:49:36 +03:00
monty@narttu.mysql.fi
bc2f77f224
Fixed test case to be more portable
2003-07-03 14:48:47 +03:00
bell@sanja.is.com.ua
7f29814769
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-07-03 14:13:47 +03:00
bell@sanja.is.com.ua
9ef453c74b
after review fix
2003-07-03 14:11:08 +03:00
bar@bar.mysql.r18.ru
74b74ad5e7
There is no Item->binary() anymore. It was remain from 4.0.
2003-07-02 18:34:43 +05:00
bell@sanja.is.com.ua
5cd54c6945
fixed typos
2003-07-02 15:03:49 +03:00
bell@sanja.is.com.ua
feb425a9f2
fixed bug, which lead to crash mysqld by running 'mysql some_db_with_tables'
2003-07-02 14:45:35 +03:00
venu@hundin.mysql.fi
19bc36241a
Removed dbug.h inclussion from client/get_password.c (windows build fix)
2003-07-02 10:49:07 +03:00
bell@sanja.is.com.ua
5b3594a80c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1
2003-07-01 19:05:31 +03:00
bell@sanja.is.com.ua
2a33b0514e
fixed uninitialized pointer
2003-07-01 19:05:08 +03:00
monty@mashka.mysql.fi
22ba0c09f4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-07-01 18:00:17 +03:00
monty@mashka.mysql.fi
cd2de0a5eb
Fixed testcases and bug introduced by last changeset
2003-07-01 17:59:42 +03:00
monty@mashka.mysql.fi
baf9baba2a
merge
2003-07-01 15:57:45 +03:00
monty@mashka.mysql.fi
a6755acb4e
Fix needed to support MERGE tables in different databases
2003-07-01 15:49:32 +03:00
bell@sanja.is.com.ua
f6a1292fb4
fexed erroro message
2003-07-01 14:54:34 +03:00
bell@sanja.is.com.ua
088cd27e74
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1
2003-07-01 10:51:39 +03:00
venu@myvenu.com
0330f0ccd0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-01 00:30:58 -07:00
venu@myvenu.com
5e65dcb9fb
sql_state.h:
...
Minor fixups for SQLSTATE values to be compatible with ODBC spec
2003-07-01 00:30:16 -07:00
bell@sanja.is.com.ua
f1353c1dda
merged
2003-07-01 10:03:20 +03:00
jani@rhols221.adsl.netsonic.fi
1c38e1790a
Made check for structured option handling more robust and faster.
...
Earlier it could have failed in some special cases.
2003-06-30 15:49:29 +03:00
monty@mashka.mysql.fi
6bc7b3a6be
LAST_INSERT_ID() should not be set if we couldn't generate an auto_increment id.
2003-06-30 13:28:36 +03:00
monty@mashka.mysql.fi
dbebed97e4
Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong LINT_INIT() options
...
Fixed bug in ALTER TABLE ... MODIFY integer-column
Added ref_or_null optimization (needed for subqueries)
2003-06-30 13:23:54 +03:00
bell@sanja.is.com.ua
7c799b17b6
merged
2003-06-29 15:35:48 +03:00
bell@sanja.is.com.ua
379e8edff1
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-06-29 14:15:38 +03:00
monty@mashka.mysql.fi
01c2c0c326
Merge
2003-06-29 13:02:54 +03:00
serg@serg.mylan
730f7e3f37
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-29 00:34:47 +02:00
serg@serg.mylan
d5fbeee71f
fixed a bug that made 4.0 MYI+FT files unreadable in 4.1
2003-06-28 23:54:33 +02:00
serg@serg.mylan
55115e0f9d
timestamp MYD-4.0 format compatibility fix
2003-06-28 23:01:33 +02:00
bell@sanja.is.com.ua
ebc2976f94
fixed bug #745
...
(resolving fields of reduced subselect)
2003-06-28 17:04:26 +03:00
bell@sanja.is.com.ua
08f8ab5917
Merge
2003-06-28 14:32:06 +03:00
bell@sanja.is.com.ua
a101fc9e79
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-cset-4.1
2003-06-28 13:43:18 +03:00
bell@sanja.is.com.ua
ad9cb47c0c
merging
...
test moved to other bug
2003-06-28 13:34:07 +03:00
serg@serg.mylan
c7c9e35c8b
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-27 22:31:28 +02:00
bell@sanja.is.com.ua
00f952849d
merging
2003-06-27 23:14:20 +03:00
bell@sanja.is.com.ua
95fbec7599
after review patch
2003-06-27 23:00:33 +03:00
bell@sanja.is.com.ua
1c2191e2cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1
2003-06-27 22:19:14 +03:00