bar@bar.mysql.r18.ru
1d20c09ce9
New SQL variables "collation_server" and "collation_database"
2003-09-15 16:31:04 +05:00
guilhem@mysql.com
2266c99bb7
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-15 12:45:48 +02: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
8d05911df0
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-15 14:48:23 +05:00
bar@bar.mysql.r18.ru
f55b05e2cf
In CREATE syntax: KEY a (field_name(10))
...
10 now means "number of characters", not number of bytes.
2003-09-15 14:45:42 +05:00
bell@sanja.is.com.ua
10c962bd41
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-09-15 11:43:11 +03:00
guilhem@mysql.com
364bb41f4b
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-15 10:31:31 +02:00
bar@bar.mysql.r18.ru
9a5e82ad64
type_nchar.result:
...
I forgot to push it in the previous changeset.
2003-09-15 12:48:34 +05:00
bell@sanja.is.com.ua
eca64292e6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-09-15 10:35:52 +03: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
bell@sanja.is.com.ua
ea187cfd42
fixed proccesing global LIMIT in last SELECT of UNION
2003-09-14 22:12:55 +03: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@dlenev.mshome
f478722077
Fixed openssl_1 test after error message was updated
2003-09-14 18:07:14 +04:00
dlenev@mysql.com
6d62d31049
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-868
2003-09-14 17:19:53 +04:00
dlenev@dlenev.mshome
f7a4d682d5
Post merge fixes. Fixed tests after adding UNTIL conditions
...
to SHOW SLAVE STATUS.
2003-09-14 17:18:38 +04:00
bell@sanja.is.com.ua
46b8c3ea8b
renamed join_types (as was suggested by Peter Gulutzan)
2003-09-14 09:40:57 +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
Sinisa@sinisa.nasamreza.org
cde0c36962
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-09-13 20:00:42 +03:00
Sinisa@sinisa.nasamreza.org
a26847c275
Fixes for OPTION_FOUND_ROWS in UNION's
2003-09-13 19:56:58 +03:00
serg@serg.mylan
d4b5b879bd
"normal" warning in test suite disabled
...
bad merge fixed
2003-09-13 16:05:17 +02:00
serg@serg.mylan
c644376a6d
error messages from english/errmsg.txt added to other languages.
...
bug#1269
2003-09-13 13:13:10 +02:00
monty@mashka.mysql.fi
f300e3a164
Remove 'extern' references from .cc files
2003-09-13 11:35:29 +03:00
bell@sanja.is.com.ua
0662489344
removed double procedure deletetion
2003-09-13 10:30:41 +03:00
bell@sanja.is.com.ua
462dba1b5b
fixed memory leak (now JOIN cleaning procedure always called)
2003-09-13 02:07:06 +03:00
Sinisa@sinisa.nasamreza.org
0088e1c657
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-09-12 19:23:47 +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
hf@deer.(none)
e63e2229b6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-12 19:36:42 +05:00
hf@deer.(none)
9f3996cde9
SCRUM:
...
#977 Prepared statements in embedded library
2003-09-12 19:35:34 +05:00
hf@deer.(none)
efce59fc3f
Monty's merge bug fixed
2003-09-12 13:44:41 +05:00
monty@mashka.mysql.fi
c477002fd4
Fix results for mix_innodb_myisam_binlog
...
Optimize calls to current_thd
2003-09-12 05:54:12 +03:00
monty@mashka.mysql.fi
04c43fca8e
Optimize thai character handling
...
Remove sel000xxxx tests
After merge fixes
2003-09-12 04:18:07 +03:00
guilhem@mysql.com
5abd722658
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-11 22:26:00 +02:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd
merge with 4.0.15
2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574
After merge fixes.
...
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
ram@mysql.r18.ru
9de77cc983
Fix for the bug #1200 : Can't start MySQL if bind-address set to hostname that starts with a number.
2003-09-11 13:50:18 +05:00
hf@deer.(none)
f434b329f5
SCRUM
...
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
2003-09-11 09:46:31 +05:00
monty@mashka.mysql.fi
62103fff40
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-11 06:10:09 +03:00
monty@mashka.mysql.fi
223a966763
Remove not used define (my_strxfrm)
2003-09-11 06:09:34 +03:00
lenz@mysql.com
541189e746
- Added option "--skip-name-resolve" to mysql_install_db to be able to
...
use the local machine's IP address instead of the host name when
building the initial grant tables if "skip-name-resolve" has been
specified in my.cnf. This can be helpful on FreeBSD to avoid
thread-safety problems with the FreeBSD resolver libraries.
(Thanks to Jeremy Zawodny for the patch)
2003-09-10 17:48:43 +02:00
guilhem@mysql.com
332ac06629
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-09-10 17:15:21 +02:00
lenz@mysql.com
57290ee65f
- Updated version number to 4.0.16 now that 4.0.15 has been released
...
- tagged ChangeSet 1.1556 as mysql-4.0.15
2003-09-10 16:48:57 +02:00
bar@bar.mysql.r18.ru
4f3474922b
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-10 17:26:09 +05:00
bar@bar.mysql.r18.ru
6fa45cec53
mysql_create_table now accepts field lengths in CREATE form, not in internal form.
...
This is to simplify fixing indexes to mean number of chars rather than bytes too.
2003-09-10 17:25:26 +05:00
hf@deer.(none)
b2a1bf2ef6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 13:00:19 +05:00
hf@deer.(none)
fd77d78804
SCRUM: embedde library
...
Minor fixes
2003-09-10 12:58:26 +05:00
bell@sanja.is.com.ua
312755e115
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-09-10 10:25:29 +03:00
hf@deer.(none)
d9ef1585d1
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-09-10 12:10:30 +05:00
hf@deer.(none)
69283f8091
SCRUM: embedded library
...
mysql_fetch_length fixed for embedded library. Now data length is stored
before the data. Pointers in row still points to the data so you have to
get *(uint*)(data_ptr - sizeof(uint)) to get data length
2003-09-10 12:09:24 +05:00