| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/usr/home/bar/mysql-5.1-new
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item.cc:
Auto merged
sql/share/charsets/Index.xml:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/usr/home/bar/mysql-5.0
sql/share/charsets/Index.xml:
Auto merged
strings/ctype-extra.c:
SCCS merged
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/usr/home/bar/mysql-4.1.12076
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixing latin1 to cp1252, according to
recent changes in ctype-latin1.c.
Index.xml:
Marking latin1_swedish_ci as "compiled"
to avoid its generating into ctype-extra.c.
ctype-extra.c:
Bug#12076 --with-extra-charsets has no effect
All supported dnamic charsets were generated
from sql/share/charsets/*.xml under #ifdefs.
Compiling is to be activated from "configure"
by adding --with-extra-charsets.
I'm not including auto-recreating of ctype-extra.c
into build process for ease purposes.
strings/ctype-extra.c:
Bug#12076 --with-extra-charsets has no effect
All supported dnamic charsets were generated
from sql/share/charsets/*.xml under #ifdefs.
Compiling is to be activated from "configure"
by adding --with-extra-charsets.
I'm not including auto-recreating of ctype-extra.c
into build process for ease purposes.
sql/share/charsets/Index.xml:
Marking latin1_swedish_ci as "compiled"
to avoid its generating into ctype-extra.c.
sql/share/charsets/latin1.xml:
Fixing latin1 to cp1252, according to
recent changes in ctype-latin1.c.
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/sp.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_base.cc:
Resolve conflict
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/bdb.result:
Resolve conflicts
mysql-test/t/bdb.test:
Resolve conflicts
sql/sql_delete.cc:
Resolve conflicts
sql/sql_insert.cc:
Resolve conflicts
sql/sql_update.cc:
Resolve conflicts
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
latin5.xml:
- Fixing order thee Turkish letters to conform Turkish rules.
- All non-Turkish accented letters are mappend
to their non-accented counterparts.
sql/share/charsets/latin5.xml:
Bug#13421 problem with sorting turkish
Fixing order to conform the Turkish rules.
All non-Turkish accented letters are mappend to
the non-accented counterparts.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Index.xml:
Adding Polish collation for cp1250.
sql/share/charsets/Index.xml:
Adding Polish collation for cp1250.
,
sql/share/charsets/cp1250.xml:
Adding Polish collation for cp1250.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/gluh/MySQL/Merge/5.0
sql/share/charsets/Index.xml:
Auto merged
strings/ctype-latin1.c:
Auto merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Index.xml:
Fixing latin1 comment:
it is actually cp1252, not iso-8859-1
ctype_latin1.result:
changeing test results accordingly.
ctype-latin1.c:
Fixed to- and from-Unicode conversion maps
for better Unicode round trip of undefined
characters.
strings/ctype-latin1.c:
Bug#11216: 'show character set' describes latin1 incorrectly
Fixed to- and from-Unicode conversion maps.
mysql-test/r/ctype_latin1.result:
changeing test results accordingly.
sql/share/charsets/Index.xml:
Fixing comment: iso-8859-1 -> cp1252
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/ram/work/mysql-5.0
include/my_global.h:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
sql/share/charsets/Index.xml:
Auto merged
|
| |
| |
| |
| |
| |
| |
| | |
Adding cp1250_croatian_ci collation.
|
| |
| |
| |
| |
| |
| |
| | |
latin2_croatian_ci collation was fixed.
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
into ibmlab.site:/home/my/bk/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
|
| |
| |
| |
| |
| |
| |
| |
| | |
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
config/ac-macros/character_sets.m4:
added cp932, eucjp_ms character set
include/m_ctype.h:
added cp932, eucjp_ms character set
libmysql/Makefile.shared:
added cp932, eucjp_ms character set
mysys/charset-def.c:
added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
added cp932, eucjp_ms character set
strings/Makefile.am:
added cp932, eucjp_ms character set
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
sql/share/charsets/Index.xml:
Add GPL notice.
sql/share/charsets/armscii8.xml:
Add GPL notice.
sql/share/charsets/ascii.xml:
Add GPL notice.
sql/share/charsets/cp1250.xml:
Add GPL notice.
sql/share/charsets/cp1251.xml:
Add GPL notice.
sql/share/charsets/cp1256.xml:
Add GPL notice.
sql/share/charsets/cp1257.xml:
Add GPL notice.
sql/share/charsets/cp850.xml:
Add GPL notice.
sql/share/charsets/cp852.xml:
Add GPL notice.
sql/share/charsets/cp866.xml:
Add GPL notice.
sql/share/charsets/dec8.xml:
Add GPL notice.
sql/share/charsets/geostd8.xml:
Add GPL notice.
sql/share/charsets/greek.xml:
Add GPL notice.
sql/share/charsets/hebrew.xml:
Add GPL notice.
sql/share/charsets/hp8.xml:
Add GPL notice.
sql/share/charsets/keybcs2.xml:
Add GPL notice.
sql/share/charsets/koi8r.xml:
Add GPL notice.
sql/share/charsets/koi8u.xml:
Add GPL notice.
sql/share/charsets/latin1.xml:
Add GPL notice.
sql/share/charsets/latin2.xml:
Add GPL notice.
sql/share/charsets/latin5.xml:
Add GPL notice.
sql/share/charsets/latin7.xml:
Add GPL notice.
sql/share/charsets/macce.xml:
Add GPL notice.
sql/share/charsets/macroman.xml:
Add GPL notice.
sql/share/charsets/swe7.xml:
Add GPL notice.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
ctype-simple.c:
Check that unicode map was loaded
cp852.xml:
Missing cp852_bin was added.
sql/share/charsets/cp852.xml:
Missing cp852_bin was added.
strings/ctype-simple.c:
Check that unicode map was loaded
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Czech collations were renamed to _cs
Index.xml:
Czech collation were renamed to _cs
sql/share/charsets/Index.xml:
Czech collation were renamed to _cs
strings/ctype-czech.c:
Czech collations were renamed to _cs
strings/ctype-win1250ch.c:
Czech collations were renamed to _cs
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Modern Spanish collation
sql/share/charsets/Index.xml:
Modern Spanish collation
sql/share/charsets/latin1.xml:
Modern Spanish collation
|
|
|
|
|
|
|
| |
new file
|
|
|
|
|
|
|
|
| |
There were errors in cp850: in unicode, ctype and sort arrays
sql/share/charsets/cp850.xml:
There were errors in cp850: in unicode, ctype and sort arrays
|
| |
|
|
|
|
|
|
|
|
| |
Upper/lower case translation bug for letter 't' fix.
sql/share/charsets/cp1251.xml:
Upper/lower case translation bug for letter 't' fix.
|
| |
|
|
|
|
|
|
|
|
| |
utf8 was not marked as compiled
sql/share/charsets/Index.xml:
utf8 was not marked as compiled
|
|
|
|
|
|
|
|
| |
cp1250_czech_ci was displayed even when not compiled-in in mistake.
sql/share/charsets/Index.xml:
cp1250_czech_ci was displayed even when not compiled-in in mistake.
|
|
|
|
|
|
|
|
|
|
|
|
| |
c
Index.xml:
Collation names form lati7 were mixed
sql/share/charsets/Index.xml:
Collation names form lati7 were mixed
sql/share/charsets/latin7.xml:
c
|
| |
|
|
|
|
|
|
|
| |
compiled
BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
Delete: mysql-test/t/ctype_ujis-master.opt
|
|
|
|
|
|
|
|
| |
Typos fixes
sql/share/charsets/Index.xml:
Typos fixes
|
| |
|
|
|
|
|
|
|
|
| |
Type
sql/share/charsets/Index.xml:
Type
|
|
|
|
|
|
|
|
|
|
| |
cp1257 is Lithuanian sorting
sql/share/charsets/Index.xml:
cp1257 is Lithuanian sorting
sql/share/charsets/cp1257.xml:
cp1257 is Lithuanian sorting
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
pclatin1 -> cp850
pclatin2 -> cp852
BitKeeper/deleted/.del-pclatin1.xml~d42c4a35e61526fa:
Delete: sql/share/charsets/pclatin1.xml
BitKeeper/deleted/.del-pclatin2.xml~419e68f6672a99a:
Delete: sql/share/charsets/pclatin2.xml
|
| |
|
|
|
|
|
|
|
|
| |
Comments why "greek" is ISO greek
sql/share/charsets/greek.xml:
Comments why "greek" is ISO greek
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some collation names have been renamed
BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
Delete: strings/ctype-latin1_de.c
libmysql/Makefile.shared:
German Phone book collation is always compiled
mysql-test/r/ctype_collate.result:
Some collation names have been renamed
mysql-test/t/ctype_collate.test:
Some collation names have been renamed
mysql-test/t/ctype_latin1_de-master.opt:
Some collation names have been renamed
mysys/charset.c:
get_charset_by_name() now will find its default collation if charset name is passed
sql/share/charsets/Index.xml:
Some collation names have been renamed
sql/share/charsets/cp1251.xml:
Some collation names have been renamed
sql/share/charsets/cp1257.xml:
Some collation names have been renamed
sql/share/charsets/latin1.xml:
Some collation names have been renamed
sql/share/charsets/latin2.xml:
Some collation names have been renamed
sql/share/charsets/latin7.xml:
Some collation names have been renamed
sql/share/charsets/macce.xml:
Some collation names have been renamed
sql/share/charsets/macroman.xml:
Some collation names have been renamed
sql/sql_show.cc:
Nicer output from SHOW COLLATION
strings/Makefile.am:
German Phone book collation is always compiled
strings/ctype-czech.c:
Some collation names have been renamed
strings/ctype-extra.c:
Don't compile dynamic charset. We should decide names convension before
making this available.
strings/ctype-latin1.c:
German Phone book collation is always compiled
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Low case letters are used in charset names
BitKeeper/deleted/.del-MacRoman.xml~f890bce37d31d382:
Delete: sql/share/charsets/MacRoman.xml
BitKeeper/deleted/.del-MacCE.xml~fca413f3126f6189:
Delete: sql/share/charsets/MacCE.xml
mysys/charset.c:
SHOW CHARACTER SET now can display comments
sql/share/charsets/Index.xml:
SHOW CHARACTER SET now can display comments
sql/sql_show.cc:
SHOW CHARACTER SET now can display comments
strings/ctype.c:
SHOW CHARACTER SET now can display comments
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Fix
sql/share/charsets/cp1256.xml:
Fix
|
|
|
|
|
|
|
|
|
|
|
|
| |
Delete: sql/share/charsets/koi8_u.xml
.del-koi8_r.xml~f95ebf1fb19f94cf:
Delete: sql/share/charsets/koi8_r.xml
BitKeeper/deleted/.del-koi8_r.xml~f95ebf1fb19f94cf:
Delete: sql/share/charsets/koi8_r.xml
BitKeeper/deleted/.del-koi8_u.xml~ec104975f7e009bf:
Delete: sql/share/charsets/koi8_u.xml
|
|
|
|
|
|
|
| |
all charset names don't have "_" sign.
|
|
|
|
|
|
|
| |
new file
|