igor@rurik.mysql.com
f29ed57531
Merge
2003-10-30 10:45:28 -08:00
bell@sanja.is.com.ua
ae380c5855
merge
2003-10-28 12:45:37 +02:00
serg@serg.mylan
8cdc27da15
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
bell@sanja.is.com.ua
faea7e0144
Merge
2003-10-23 21:26:06 +03:00
serg@serg.mylan
b820d2a347
query expansion for fulltext search
2003-10-23 15:21:06 +02:00
bell@sanja.is.com.ua
934fa2a104
Merge
2003-10-22 20:52:47 +03:00
serg@serg.mylan
df69309593
MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax
2003-10-22 17:57:09 +02:00
serg@serg.mylan
f944fd4a65
merged
2003-10-21 11:58:43 +02:00
serg@serg.mylan
c60ef8160f
FULLTEXT: correct charset support (UTF included, UCS2 - not)
...
code cleanup
2003-10-20 15:53:48 +02:00
gluh@gluh.mysql.r18.ru
4bed4abb62
Merge commit
2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800
Scrum task 835 - text-to-datetime conversion function
2003-10-20 13:24:18 +05:00
bell@sanja.is.com.ua
a7bdd19707
subqueries made printable
...
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
gluh@gluh.mysql.r18.ru
9c2867c2d4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
2003-10-15 14:51:56 +05:00
gluh@gluh.mysql.r18.ru
9e401712a0
WL#1106: Switch = --maxdb rather than --sapdb
2003-10-15 14:50:36 +05:00
harrison@bud.lordblink.com
672a7791c4
Add in bit_xor function (approved by Sergei)
2003-10-15 02:11:03 -04:00
heikki@hundin.mysql.fi
f90253a7f8
sql_yacc.yy:
...
Add DISCARD etc. in the keyword: rule of sql_yacc.yy
sql_table.cc:
Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
2003-10-14 01:52:03 +03:00
heikki@hundin.mysql.fi
5ec87f2449
Many files:
...
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
2003-10-13 11:20:19 +03:00
bell@laptop.sanja.is.com.ua
ddf4d1e529
fixed printability of Items (all items except subselects)
...
(SCRUM) (WL#1274)
2003-10-12 17:56:05 +03:00
bell@laptop.sanja.is.com.ua
afac13d033
Some simple optimisation
...
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
2003-10-08 17:40:54 +03:00
bell@laptop.sanja.is.com.ua
d5a7a6ec34
merge
2003-10-07 08:51:09 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42
Merge
2003-10-06 20:55:06 +03:00
bell@laptop.sanja.is.com.ua
ba26a1aa64
fix error messages
...
fix derived inside subqueries
2003-10-06 13:16:56 +03:00
bell@laptop.sanja.is.com.ua
16733e423e
prohibited using derived tables in UPDATE command (BUG#1477)
...
fixed incorrect table name in test
2003-10-05 21:09:50 +03:00
bell@laptop.sanja.is.com.ua
9db4024b8d
thd pointer storing moved to fix_fields() (WL#1254) (SCRUM)
2003-10-02 22:19:41 +03:00
igor@rurik.mysql.com
17aecac32c
Manual merge after improving concurrency for key cache reassignment
2003-10-01 20:16:36 -07:00
monty@mishka.mysql.fi
c22c1d8a4d
merge
2003-09-24 10:24:56 +03:00
bar@bar.mysql.r18.ru
4cb99ed5bb
Bug fix:
...
http://bugs.mysql.com/bug.php?id=1129
From: Georg Richter
Description: there is a problem with special chars like umlauts in comments
2003-09-16 12:14:40 +05:00
bar@bar.mysql.r18.ru
07a9b89f85
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-15 16:40:49 +05:00
bar@bar.mysql.r18.ru
1d20c09ce9
New SQL variables "collation_server" and "collation_database"
2003-09-15 16:31:04 +05:00
guilhem@gbichot2
dcab920a40
Accept SLAVE START and STOP, even if deprecated.
2003-09-15 12:43:31 +02:00
bar@bar.mysql.r18.ru
1726b4d89e
New syntax:
...
CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
NATIONAL VARCHAR
NCHAR VARCHAR
NATIONAL CHARACTER VARYING
NCHAR VARYING
- Tests were added for all the above syntaxes.
2003-09-15 10:26:48 +05:00
monty@mashka.mysql.fi
c674ffd5f1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-09-14 18:14:43 +03:00
dlenev@mysql.com
2c24b2e9b4
Manual merge after commiting START SLAVE UNTIL
2003-09-14 01:57:09 +04:00
dlenev@dlenev.mshome
c0cfae1c8d
Implemented support for START SLAVE UNTIL (WL#868)
2003-09-14 00:13:41 +04:00
monty@mashka.mysql.fi
f300e3a164
Remove 'extern' references from .cc files
2003-09-13 11:35:29 +03:00
Sinisa@sinisa.nasamreza.org
a424ccee17
Fix for a bug #1231
...
Parse error caused global ORDER BY to be initialized although it should
not have been.
2003-09-12 19:17:30 +03:00
Sinisa@sinisa.nasamreza.org
5e32805713
Fix for a bug #1226 .
...
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
2003-09-09 15:23:38 +03:00
serg@serg.mylan
7d2b0a0ce7
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-03 15:40:19 +02:00
kostja@oak.local
36dd82c1d5
merge commit, hope that none of bar and dlenev changes were
...
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c
merged
2003-09-03 12:07:18 +02:00
serg@serg.mylan
2fcab1c2ee
CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]
2003-09-03 11:34:32 +02:00
dlenev@mysql.com
73ab4be246
Manual merge fixes
2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2
Implemented replication over SSL
...
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
Honoring this parameters during connection to master.
Introduced new format of master.info file
2003-09-01 15:16:20 +04:00
monty@narttu.mysql.fi
27e331c30a
Revert change of lower-case-table handling as this breaks how alias works.
...
Changes like this should be done to 4.1, not to a stable release
2003-08-29 04:17:30 +03:00
monty@narttu.mysql.fi
60dd8a2c4f
hanged UDF interface to use clear() instead of reset()
2003-08-27 22:30:50 +03:00
igor@rurik.mysql.com
055daee79d
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-26 15:16:29 -07:00
igor@rurik.mysql.com
2090d57929
key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
...
After merge fix
2003-08-26 15:14:13 -07:00
monty@narttu.mysql.fi
7b99412988
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-08-26 17:53:42 +03:00
monty@narttu.mysql.fi
753cb8509c
Cleanups
...
BTREE, HASH and RTREE are not reserved symbols anymore
2003-08-26 17:52:54 +03:00
igor@rurik.mysql.com
3f6daf6ed2
Manual merge
2003-08-26 00:15:49 -07:00