Commit graph

1905 commits

Author SHA1 Message Date
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
791ae8d34d merge 2003-07-01 13:57:46 +03:00
bell@sanja.is.com.ua
f1353c1dda merged 2003-07-01 10:03:20 +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
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
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
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
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
serg@serg.mylan
32ea8fea28 fix test when no InnoDB is present 2003-06-27 19:32:59 +02: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
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
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
bell@sanja.is.com.ua
2d120d32fa cond_count moved to SELECT_LEX_NODE
fixed BUG #726
2003-06-26 11:09:11 +03: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
76315814b7 Fixed error handling to be able do not interrupt update (907) (SCRUM)
fixed bug of current select pointer in subselect execution
fixed layuot
2003-06-25 01:19:09 +03:00
gluh@gluh.mysql.r18.ru
91e3245b67 Merge gluh@gw:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-06-23 13:02:28 +05:00
gluh@gluh.mysql.r18.ru
66af4b5c9a Internal commit 2003-06-23 12:56:44 +05:00
bell@sanja.is.com.ua
b171910b2b fixed BUG #679
outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
one-letter variables name fixed
2003-06-20 10:15:58 +03: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