Commit graph

7874 commits

Author SHA1 Message Date
wax@kishkin.ru
9abea0aa2f mysqld.cc:
missing comma
2003-04-02 20:49:16 +06:00
wax@kishkin.ru
9dd60d91f2 Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into kishkin.ru:/home/wax/mysql-4n
2003-04-02 19:42:25 +06:00
wax@kishkin.ru
8c0de640e3 resolve new updates group_concat 2003-04-02 19:16:19 +06:00
lenz@mysql.com
42dff2e897 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-04-02 14:39:20 +02:00
lenz@mysql.com
d97caf59ca - increased bdb_max_lock value to pass sql-bench
- re-enabled OpenSSL for the Max RPM package
2003-04-02 14:38:25 +02:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
wax@kishkin.ru
77eb790ec5 SCRUM
correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL
2003-04-02 17:55:53 +06:00
ram@mysql.r18.ru
87ee144f7b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-04-02 15:39:57 +05:00
ram@mysql.r18.ru
9295366a5e GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
functions have been added (as synonyms for GEOMFROMWKB()).
2003-04-02 15:38:06 +05:00
arjen@george.bitbike.com
d32785e2a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into george.bitbike.com:/home/arjen/mysql-4.1
2003-04-02 20:12:57 +10:00
arjen@george.bitbike.com
a7a3a28696 prepare.texi merged into manual (mysqldoc tree), file removed. 2003-04-02 20:12:01 +10:00
monty@narttu.mysql.fi
ec70bac3b9 Fixed problem with const table named with crashed test suite on MacOSX 2003-04-02 13:06:33 +03:00
guilhem@mysql.com
4824d6c66c Sprint task #856 : make table exclusion rules (in replication)
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
Sinisa@sinisa.nasamreza.org
62179ccb22 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-04-01 20:01:59 +03:00
guilhem@mysql.com
1211b9a513 Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.
2003-04-01 18:19:15 +02:00
bar@bar.mysql.r18.ru
8cbad53268 cp1257.xml, Index.xml:
cp1257 is Lithuanian sorting
2003-04-01 19:03:02 +05:00
bar@bar.mysql.r18.ru
83cbc2838a Some collation have been renamed to fit into convension 2003-04-01 18:54:01 +05:00
bar@bar.mysql.r18.ru
11ce18a935 Standard charset names:
pclatin1 -> cp850
pclatin2 -> cp852
2003-04-01 17:49:24 +05:00
bar@bar.mysql.r18.ru
48bf81f62e charset2html.c:
It's now working under HTTPD as a CGI. Very convenient!
2003-04-01 17:26:28 +05:00
bar@bar.mysql.r18.ru
ca1a736296 mbcharlen() is now used instead of ismbhead(). The last one has been removed. 2003-04-01 15:52:09 +05:00
ram@mysql.r18.ru
d5030a0541 Bug fix: should use my_free() instead of my_afree() after my_multi_malloc(). 2003-04-01 15:33:09 +05:00
bar@bar.mysql.r18.ru
0002beb7a4 my_strncasecmp() is not used anymore. Use my_strncoll() instead. 2003-04-01 14:17:28 +05:00
bar@bar.mysql.r18.ru
5b50426f8f Some optimization in CHARSET_INFO:
We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.
2003-04-01 12:45:16 +05:00
bar@bar.mysql.r18.ru
ffa5f52e2d Better error message 2003-04-01 10:26:36 +05:00
bar@bar.mysql.r18.ru
dd2ef4fe8f Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-04-01 09:29:22 +05:00
bar@bar.mysql.r18.ru
1f0a7dd62e sql_string.cc:
We finally decided that national character set is utf8 :)
2003-04-01 09:28:53 +05:00
greg@mysql.com
b9889bd225 New XDC file for NetWare pre-emption 2003-03-31 18:09:13 -05:00
vva@eagle.mysql.r18.ru
718b011da5 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/RUS_READLINE/mysql-4.1
2003-03-31 19:09:12 -04:00
vva@eagle.mysql.r18.ru
ab4409590a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/RUS_READLINE/mysql-4.1
2003-03-31 18:44:10 -04:00
vva@eagle.mysql.r18.ru
9686b98b8e temporary trick for work with different locales (koi8r for example) 2003-03-31 18:39:14 -04:00
serg@sergbook.mysql.com
91d6ec3438 don't increment LAST_INSERT_ID() when incremented value cannot be stored in auto_increment column (e.g. is too big) 2003-03-31 23:14:26 +04:00
greg@mysql.com
6441347435 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-31 11:28:41 -05:00
greg@mysql.com
fbe8359e4f Add new XDC file for NetWare pre-emption, drop old build scripts, libmysqld.def 2003-03-31 11:28:20 -05:00
bar@bar.mysql.r18.ru
76bc088b6e lex.h:
Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.
2003-03-31 19:53:50 +05:00
lenz@mysql.com
09c175a07a - Fix for bug #200 (added missing @WRAPLIBS@ to LIBS in
libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
   for pointing this out)
2003-03-31 14:50:29 +02:00
Sinisa@sinisa.nasamreza.org
c25d959f80 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-31 15:23:16 +03:00
ram@mysql.r18.ru
446f6331e2 Bug fix: should use my_multi_malloc() here!!! 2003-03-31 13:32:34 +05:00
bar@bar.mysql.r18.ru
f0155f6a44 ALTER TABLE didn't remember the exact
geometry type (POINT, LINESTRING, etc)
and changed all into "GEOMETRY".
2003-03-31 09:19:20 +05:00
jani@dsl-kpogw4gb5.dial.inet.fi
66d9143a66 Added quotes around CREATE DATABASE IF EXISTS name if -Q was given. 2003-03-30 19:36:14 +03:00
hf@deer.mysql.r18.ru
deca14ebde truncating REPLACE result bug fix 2003-03-30 18:36:01 +05:00
serg@sergbook.mysql.com
e9492a1d83 ft benchmark suite: initial checkin 2003-03-29 20:40:03 +03:00
jani@dsl-kpogw4gb5.dial.inet.fi
4336d4117e Added quotes around database name, when using -Q. 2003-03-29 16:59:03 +02:00
Sinisa@sinisa.nasamreza.org
c027af6459 Fix for a crashing bug in union.
Parameters for temporary tables were created locally in the function
and it's address passed to a field in select_result, which produced
random errors when MyISAM table was created based on this bogus
address.
2003-03-29 16:41:01 +02:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
bar@bar.mysql.r18.ru
a83d0497d7 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-28 19:37:55 +04:00
bar@bar.mysql.r18.ru
74a7d23aab charset.c:
strcasecmp -> my_strcasecmp
  This fix compilation problem on windows
2003-03-28 19:37:25 +04:00
Sinisa@sinisa.nasamreza.org
65b9f4a306 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-28 16:58:52 +02:00
Sinisa@sinisa.nasamreza.org
165b3960be Fixing crashing bugs as reported in bugs database
#195
2003-03-28 16:57:03 +02:00
bell@sanja.is.com.ua
05982c8501 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-03-28 16:18:27 +02:00
bell@sanja.is.com.ua
e4bc744d9b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1
2003-03-28 16:18:26 +02:00