Commit graph

3619 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
e165845d39 sys_var_collation is now abstract class
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
2003-04-07 16:10:27 +05:00
bar@bar.mysql.r18.ru
e0caf3f225 New methods to store strings with "convert to" argimument 2003-04-07 13:52:48 +05:00
bell@sanja.is.com.ua
4cecc44ce7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 21:51:03 +03:00
mysql@home.(none)
bbf710b35e Some optimization in SET NAMES 2003-04-05 18:56:15 +05:00
bell@sanja.is.com.ua
fa46807825 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 15:17:16 +03:00
mysql@home.(none)
e93e98c239 sql_yacc.yy:
I wonder how it happend that I compiled this!
2003-04-05 17:02:34 +05:00
mysql@home.(none)
bc1fe848cb sql_yacc.yy, set_var.h, set_var.cc:
Optimization of SET NAMES
2003-04-05 15:59:29 +05:00
bell@sanja.is.com.ua
65c356cfa8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 09:29:58 +03:00
bell@sanja.is.com.ua
7bd0d02bda fixed st_select_lex initialization
fixed mustiupdate subselect compatibility

(bug 217)
2003-04-05 09:29:28 +03:00
mysql@home.(none)
6a948b8363 sql_cache.cc:
Cast to unsigned char
2003-04-05 07:59:10 +05:00
pem@mysql.com
3ee502837a Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2003-04-04 14:24:01 +02:00
pem@mysql.com
608cba3f5a Added missing error message (was only added in english/).
Removed extraneous error message from german/errmsg.txt.
2003-04-04 14:23:24 +02:00
bar@bar.mysql.r18.ru
8946f1ea9d Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-04-04 17:22:26 +05:00
bar@bar.mysql.r18.ru
da50242988 Index.xml:
Type
2003-04-04 17:21:48 +05:00
ram@mysql.r18.ru
d29557cb68 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-04 14:10:24 +05:00
ram@mysql.r18.ru
7a856411ec Fixed envelope() function. 2003-04-04 14:09:08 +05:00
arjen@george.bitbike.com
be27b2369b Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect). 2003-04-04 14:06:52 +10:00
pem@mysql.com
331c56bc36 And got rid of signess warnings... 2003-04-03 20:19:18 +02:00
pem@mysql.com
f197b179a5 Got rid of silly compiler errors on HP-UX and SGI Irix. 2003-04-03 20:19:16 +02:00
bar@bar.mysql.r18.ru
3e0464b84d field.cc:
Geometry is now large blob
2003-04-03 23:19:15 +05:00
monty@narttu.mysql.fi
4a4838059f Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) 2003-04-03 21:19:14 +03:00
monty@narttu.mysql.fi
22075460d8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-04-03 21:19:13 +03:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
aa4bf1cd8d After merge fix 2003-04-03 21:19:11 +03:00
monty@narttu.mysql.fi
d56dc85205 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 19:55:37 +03:00
vva@eagle.mysql.r18.ru
04b81ac9ac Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 12:55:36 -04:00
vva@eagle.mysql.r18.ru
f45be5e6cd added test for replication load data into temporary table with additional options 2003-04-03 12:54:08 -04:00
vva@eagle.mysql.r18.ru
4fb9cb0097 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 10:30:41 -04:00
ram@mysql.r18.ru
1c9e9bb613 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-03 15:18:56 +05:00
ram@mysql.r18.ru
2180fa858b AsWKB() function has been added. 2003-04-03 15:13:14 +05:00
monty@narttu.mysql.fi
8f957e6ab5 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-04-03 13:08:28 +03:00
monty@narttu.mysql.fi
e96c75fec0 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) 2003-04-03 13:07:42 +03:00
bar@bar.mysql.r18.ru
688aaf4152 sql_cache.cc:
Windows compilation fix
2003-04-03 14:52:12 +05:00
monty@narttu.mysql.fi
618857b6eb Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
2003-04-03 12:33:13 +03:00
monty@narttu.mysql.fi
3cdc8ae55b Portability fix (for AMD hammer) 2003-04-03 12:10:38 +03:00
monty@narttu.mysql.fi
bf315f30d5 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 11:29:38 +03:00
monty@narttu.mysql.fi
c1ff07cbb9 Safer stack checking 2003-04-03 11:29:10 +03:00
wax@kishkin.ru
9abea0aa2f mysqld.cc:
missing comma
2003-04-02 20:49:16 +06:00
wax@kishkin.ru
8c0de640e3 resolve new updates group_concat 2003-04-02 19:16:19 +06: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
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
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
ca1a736296 mbcharlen() is now used instead of ismbhead(). The last one has been removed. 2003-04-01 15:52:09 +05:00