Commit graph

8753 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
f6a1292fb4 fexed erroro message 2003-07-01 14:54:34 +03:00
bell@sanja.is.com.ua
791ae8d34d merge 2003-07-01 13:57:46 +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
paul@teton.kitebird.com
a8b104da9d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-06-27 12:37:31 -05:00
serg@serg.mylan
32ea8fea28 fix test when no InnoDB is present 2003-06-27 19:32:59 +02:00
jani@rhols221.adsl.netsonic.fi
41aa9a026d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
2003-06-27 18:52:09 +03:00
jani@rhols221.adsl.netsonic.fi
541b0d5322 Added support for structured options (WL task ID 947). 2003-06-27 18:51:39 +03:00
monty@mashka.mysql.fi
dfac0fc90a Allow one to use MERGE tables with tables from different databases
Added command 'replace_column' to mysqltest
2003-06-27 16:29:10 +03:00
lenz@mysql.com
144f7f57c7 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-06-27 13:23:43 +02:00
bar@bar.mysql.r18.ru
28b2fcba27 item.cc:
A better comment
2003-06-27 16:09:53 +05: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
lenz@kallisto.local
382e1ad064 - fixed typo (dbl -> dnl) in acinclude.m4 2003-06-27 10:07:22 +02:00
bar@bar.mysql.r18.ru
52a7f95678 BETWEEN now works according to collation rules 2003-06-27 12:02:08 +05:00
paul@teton.kitebird.com
33f8d7aedf Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-06-26 11:04:20 -05:00
serg@serg.mylan
e7b28cbc56 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-26 13:23:37 +02:00
serg@serg.mylan
f6b0f559c3 preload.test:
Change mode to -rw-rw-r--
2003-06-26 13:23:08 +02:00
bar@bar.mysql.r18.ru
65335d37ff New messages for 3-adic and N-adic operations
REPLACE() now processed arguments collations according to standard
2003-06-26 15:45:04 +05:00
bell@sanja.is.com.ua
2d120d32fa cond_count moved to SELECT_LEX_NODE
fixed BUG #726
2003-06-26 11:09:11 +03:00
gluh@gluh.mysql.r18.ru
7455759f11 Bug fixed: mysql-test failure on rpl tests 2003-06-26 09:39:23 +05:00
bk@mysql.r18.ru
3038105e19 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/bk/mysql-4.1
2003-06-26 08:51:36 +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
paul@teton.kitebird.com
36a75d26f2 modify error message 2003-06-25 16:25:03 -05:00
monty@mashka.mysql.fi
fff60e3a86 Fixed slowdown problem on windows 2003-06-25 19:43:06 +03:00
Sinisa@sinisa.nasamreza.org
bb764d6b5e code cleanup 2003-06-25 18:34:46 +03:00
bar@bar.mysql.r18.ru
e009dce0c3 item_func.cc:
My stupid typo fix
2003-06-25 19:50:27 +05:00
bar@bar.mysql.r18.ru
c47c07ca6d Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-25 19:03:36 +05:00
bell@sanja.is.com.ua
39fb96c662 fixed mistyping (BUG #699) 2003-06-25 16:51:00 +03: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
bk@mysql.r18.ru
dad54b7d29 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/bk/mysql-4.1
2003-06-25 11:47:52 +05:00