hf@deer.(none)
ad5cbc0265
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.615
2003-06-26 09:01:25 +05:00
monty@mashka.mysql.fi
7655f05dc2
LEFT JOIN optimization: Change LEFT JOIN to normal join if possible
2003-06-26 05:38:19 +03:00
vva@eagle.mysql.r18.ru
5722ae6627
fixed bug with type of user variables (bug #551 )
2003-06-25 21:11:23 -04: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
bell@sanja.is.com.ua
2f54542f59
after merging fix
2003-06-26 00:16:03 +03:00
bell@sanja.is.com.ua
7b77c5a2d3
merged
2003-06-25 23:52:15 +03:00
hf@deer.(none)
0ede29ffd0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.674
2003-06-25 17:16:53 +05:00
hf@deer.(none)
45b3c643be
Testcase for #674 added
2003-06-25 17:15:33 +05: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
hf@deer.(none)
044d077893
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.666
2003-06-24 17:09:44 +05:00
hf@deer.(none)
383d354c5c
Test case for bug #666
2003-06-24 17:07:43 +05:00
hf@deer.(none)
3007290f83
Another bugfix for #615
...
Looks a bit nicer than previous one
2003-06-24 10:53:21 +05:00
monty@narttu.mysql.fi
28e96d95c5
Simple code cleanup
2003-06-23 20:05:54 +03:00
monty@narttu.mysql.fi
a51ea11147
SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
2003-06-23 20:03:59 +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
gluh@gluh.mysql.r18.ru
afe1547866
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek
2003-06-23 12:03:50 +05:00
guilhem@mysql.com
04e5a6baa9
Always send a fake Rotate event (this is roughly 70 bytes) when starting binlog_dump.
...
This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
immediately. BUG#198.
2003-06-21 18:10:59 +02: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
gluh@gluh.mysql.r18.ru
289d375f50
SCRUM
...
Task ID 894:
Backport default_week_format variable to 4.0
2003-06-19 14:02:19 +05: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
guilhem@mysql.com
4deb135b0b
Changed change_master() to use ER_MASTER_INFO (better display).
2003-06-17 23:19:38 +02:00
guilhem@mysql.com
0a0ca19940
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-17 16:36:29 +02:00
guilhem@mysql.com
ab5479e6e2
Better error reporting in mysql-test-run (don't hide the important message
...
with 'head').
Test fix (this sync_with_master was nonsense).
Now all tests pass in 4.0 in autobuild.
2003-06-17 16:35:20 +02:00
Sinisa@sinisa.nasamreza.org
c53202b1d7
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-06-17 16:25:22 +03:00
serg@serg.mylan
b387b5add9
fulltext and left join bug fixed
2003-06-16 23:05:45 +02:00
guilhem@mysql.com
3f33f17114
Fix for nightly build test failure (test update).
...
More messages.
Testcase for bug 651.
2003-06-16 15:49:54 +02: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
guilhem@mysql.com
d2ea62cd14
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-15 12:03:01 +02:00
guilhem@mysql.com
80edc81ed0
Simplified a test.
...
thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop
when it's waiting for relay log space.
Reset ignore_log_space_limit to 0 when the SQL thread terminates.
2003-06-15 12:01:51 +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
heikki@hundin.mysql.fi
4da7f485b7
Many files:
...
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
2003-06-15 01:04:28 +03:00
guilhem@mysql.com
2e8cb7c3e0
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-14 16:41:17 +02: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
Sinisa@sinisa.nasamreza.org
0791fe35b6
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-06-12 16:53:37 +03:00