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
bar@bar.mysql.r18.ru
b528745dce
When unifying arguments for comparion, binary strings won character strings,
...
and comparison was done binary. Now, a binary string wins a character sting
taking in account their derivation. That means a character field wins a
binary literal and comparison is done according to the character field
collation, not binary.
2003-06-27 16:08:52 +05:00
bar@bar.mysql.r18.ru
d31de69795
str0 IN (str1, str2, ...) now works according to collation rules
2003-06-27 13:52:38 +05:00
bar@bar.mysql.r18.ru
52a7f95678
BETWEEN now works according to collation rules
2003-06-27 12:02:08 +05:00
wax@kishkin.ru
492813d966
Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g
2003-06-26 05:06:49 +06:00
bar@bar.mysql.r18.ru
c6c4e8b8e1
LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
...
now process arguments according to standard SQL collation determation
rules.
2003-06-25 15:07:20 +05:00
bell@sanja.is.com.ua
af6de3bfee
merging
2003-06-19 16:15:11 +03:00
bell@sanja.is.com.ua
8ac294c9ac
after merge fix
2003-06-19 16:08:11 +03:00
bell@sanja.is.com.ua
096ae170ae
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1
2003-06-19 15:25:41 +03:00
igor@rurik.mysql.com
63691e27a2
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 02:42:49 -07:00
igor@rurik.mysql.com
98eeaa54f3
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-19 02:39:46 -07:00
igor@rurik.mysql.com
3ed12d5a74
preload.result, preload.test:
...
Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
Syntax change for preload statement
2003-06-19 02:34:33 -07:00
bar@bar.mysql.r18.ru
069e57bd2f
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-19 13:13:40 +05:00
bar@bar.mysql.r18.ru
ebb88ec6ea
LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations
2003-06-19 13:12:55 +05:00
igor@rurik.mysql.com
5a6d0da277
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 00:01:16 -07:00
bar@bar.mysql.r18.ru
69af692a5c
These functions now return a result of proper collation:
...
BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE
2003-06-19 11:36:44 +05:00
igor@rurik.mysql.com
5425591503
Merge
2003-06-18 07:31:23 -07:00
serg@serg.mylan
0d02b972db
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-16 00:13:25 +02:00
serg@serg.mylan
7a08f3653b
bad merge fixed
2003-06-16 00:13:23 +02:00
monty@narttu.mysql.fi
d33cb08eb6
LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.
2003-06-15 12:34:04 +03:00
igor@rurik.mysql.com
f6b1262070
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-13 09:12:20 -07:00
guilhem@mysql.com
adb9cf36bf
cleaned user used in tests 'connect' and 'rpl_temporary'
2003-06-13 11:17:31 +02:00
igor@rurik.mysql.com
c9c8cb4b64
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-13 02:06:38 -07:00
guilhem@mysql.com
8a0508495d
user change to avoid conflicts with user 'test'
2003-06-12 23:16:21 +02:00
igor@rurik.mysql.com
a0f3dcc3c8
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
1e5dec8cf8
preload.result, preload.test:
...
new file
2003-06-12 05:26:50 -07:00
guilhem@mysql.com
4b2fa4ea22
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-06-11 17:13:40 +02:00
serg@serg.mylan
17ca456848
test result updated
2003-06-11 17:07:34 +02:00
guilhem@mysql.com
e04a9e6740
We now require SUPER privilege for SET PSEUDO_THREAD_ID.
2003-06-11 17:07:33 +02:00
serg@serg.mylan
4a5ca3946a
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-10 15:39:32 +02:00
serg@serg.mylan
287ea05705
test results updated
2003-06-10 15:19:59 +02:00
bar@bar.mysql.r18.ru
22a7449c7c
LOAD_FILE() is now COERCIBLE
...
LOAD_FILE() tests
2003-06-10 17:53:06 +05:00
bar@bar.mysql.r18.ru
5b9db52966
Function INSERT() now works according to coercibility rules
...
Test for INSERT() has been added
2003-06-10 16:41:42 +05:00
bar@bar.mysql.r18.ru
2ba654fda0
Coercibility tests for
...
- equal predicate
- LIKE predicate
- strcmp() function
2003-06-10 15:25:27 +05:00
bar@bar.mysql.r18.ru
3d08cfecd4
Some more functions work according to coercibility now:
...
repeat, reverse, quote, soundex, substring
Test func_str has been extended to check them
2003-06-10 14:54:03 +05:00
ram@mysql.r18.ru
bf45493175
Bugfix for HEAP table rb-index scan.
2003-06-10 12:19:28 +05:00
wax@kishkin.ru
ed02be687c
Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g
2003-06-07 02:28:11 +06:00
gluh@gluh.mysql.r18.ru
b68eab61a6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke
2003-06-06 17:44:33 +05:00
gluh@gluh.mysql.r18.ru
7d020eae17
REVOKE all privileges and delete user(244)
2003-06-06 17:43:23 +05:00
monty@narttu.mysql.fi
059b1e5612
After merge fixes
2003-06-05 23:19:56 +03:00
monty@narttu.mysql.fi
7a54334443
Merge with 4.0.13
2003-06-05 17:33:38 +03:00
jani@ua126d19.elisa.omakaista.fi
4b55fbe092
Fixed a bug in concat_ws(), which did not add concat separator
...
in case of an empty string. Bug ID 586.
2003-06-05 15:06:19 +03:00
wax@kishkin.ru
f922d48f42
Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4g
2003-06-05 16:30:24 +06:00
monty@narttu.mysql.fi
dad0664579
merge with public tree
2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
f5bb1e0907
After merge fix
2003-06-04 23:17:01 +03:00
monty@narttu.mysql.fi
40109c574a
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7
Added SQLSTATE to client/server protocol
...
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
guilhem@mysql.com
3b974039f7
-- Waiting for Monty's approval before push --
...
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master:
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
2003-06-03 15:47:29 +02:00
bar@bar.mysql.r18.ru
f696135c30
Collation & coercibility tests for LTRIM, RTRIM and TRIM
2003-06-03 17:13:19 +05:00
wax@kishkin.ru
61f7821323
Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4g
2003-06-03 17:07:46 +06:00