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:/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
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.
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/ram/work/mysql-5.0
include/my_global.h:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
sql/share/charsets/Index.xml:
Auto merged
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
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
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
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
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
