Commits · 9dfe574c41921b708b1b701e3bb880b1d2ad2f23 · nexedi / MariaDB

07 Apr, 2003 4 commits
- All collation names are now fit into convension · 9dfe574c
  unknown authored Apr 07, 2003
  
  9dfe574c
- sys_var_collation is now abstract class · b4eb7b35
  unknown authored Apr 07, 2003
```
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
```
  b4eb7b35
- New methods to store strings with "convert to" argimument · 4b721f06
  unknown authored Apr 07, 2003
  
  4b721f06
- fixed bug with locales in libedit · 77370ca4
  unknown authored Apr 06, 2003
```
configure.in:
  fixed bug with external libedit
```
  77370ca4
05 Apr, 2003 8 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ba1abaa2
unknown authored Apr 05, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/sql_yacc.yy:
  Auto merged
```
ba1abaa2

Some optimization in SET NAMES · 72d3b3a1

unknown authored Apr 05, 2003


mysql-test/r/ctype_collate.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/r/variables.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/ctype_collate.test:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/variables.test:
  SET NAMES charset COLLATE collation is new syntax

72d3b3a1

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · a24734ce
unknown authored Apr 05, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/sql_yacc.yy:
  Auto merged
```
a24734ce

sql_yacc.yy: · 97415bd7

unknown authored Apr 05, 2003

  I wonder how it happend that I compiled this!


sql/sql_yacc.yy:
  I wonder how it happend that I compiled this!

97415bd7

sql_yacc.yy, set_var.h, set_var.cc: · 9b4452f8

unknown authored Apr 05, 2003

  Optimization of SET NAMES


sql/set_var.cc:
  Optimization of SET NAMES
sql/set_var.h:
  Optimization of SET NAMES
sql/sql_yacc.yy:
  Optimization of SET NAMES

9b4452f8

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 58676d75

unknown authored Apr 05, 2003

into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

58676d75

fixed st_select_lex initialization · 1a0898c3

unknown authored Apr 05, 2003

fixed mustiupdate subselect compatibility

(bug 217)



mysql-test/r/subselect.result:
  test of multi-update & subselect
mysql-test/t/subselect.test:
  test of multi-update & subselect
sql/sql_update.cc:
  added subselect compatibility to query cache
sql/sql_yacc.yy:
  right st_select_lex initialization 
  layout fix

1a0898c3

sql_cache.cc: · 6fa8e897

unknown authored Apr 05, 2003

  Cast to unsigned char


sql/sql_cache.cc:
  Cast to unsigned char

6fa8e897

04 Apr, 2003 9 commits

Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5582a83a
unknown authored Apr 04, 2003
```
into mysql.com:/home/pem/work/mysql-4.1
```
5582a83a

Added missing error message (was only added in english/). · 33acac60

unknown authored Apr 04, 2003

Removed extraneous error message from german/errmsg.txt.


sql/share/czech/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/danish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/dutch/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/estonian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/french/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/german/errmsg.txt:
  Added missing error message (was only added in english/).
  Removed extraneous error message.
sql/share/greek/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/hungarian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/italian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/japanese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/korean/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian-ny/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/polish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/portuguese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/romanian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/russian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/serbian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/slovak/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/spanish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/swedish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/ukrainian/errmsg.txt:
  Added missing error message (was only added in english/).

33acac60

Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 1e95930f
unknown authored Apr 04, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
1e95930f
Index.xml: · 59bf122b
unknown authored Apr 04, 2003
```
  Type


sql/share/charsets/Index.xml:
  Type
```
59bf122b
Updating subselect results after SUBSELECT was changed into SUBQUERY. · f859761a
unknown authored Apr 04, 2003
```
mysql-test/r/subselect.result:
  Updating results after SUBSELECT was changed into SUBQUERY.
```
f859761a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2dc116a5
unknown authored Apr 04, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp


sql/item_strfunc.cc:
  Auto merged
```
2dc116a5
Fixed envelope() function. · 5aeebd64
unknown authored Apr 04, 2003

5aeebd64
Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect). · a2b79b99
unknown authored Apr 04, 2003

a2b79b99
gis.txt deleted - updated text merged into manual (mysqldoc tree). · 90961f24
unknown authored Apr 04, 2003
```
BitKeeper/deleted/.del-gis.txt~2dde6d55b3075921:
  Delete: Docs/gis.txt
```
90961f24

03 Apr, 2003 19 commits

And got rid of signess warnings... · d6b847ff
unknown authored Apr 03, 2003

d6b847ff
Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5e7641a9
unknown authored Apr 03, 2003
```
into mysql.com:/home/pem/work/mysql-4.1
```
5e7641a9
Got rid of silly compiler errors on HP-UX and SGI Irix. · 4d465bc2
unknown authored Apr 03, 2003

4d465bc2
Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c033b474
unknown authored Apr 04, 2003
```
into mysql.com:/home/walrus/bk/41
```
c033b474

field.cc: · 5d003684

unknown authored Apr 03, 2003

  Geometry is now large blob


sql/field.cc:
  Geometry is now large blob

5d003684

Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) · 67a854a7

unknown authored Apr 03, 2003


sql/item_sum.cc:
  Fixed bug in warning handling.
sql/item_sum.h:
  Fixed bug in warning handling.
sql/sql_class.h:
  Fixed bug in warning handling.
sql/sql_error.cc:
  Fixed bug in warning handling.
strings/my_vsnprintf.c:
  After merge fix

67a854a7

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c41b7356

unknown authored Apr 03, 2003

into narttu.mysql.fi:/my/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

c41b7356

Merge with 4.0 · 6c36f424

unknown authored Apr 03, 2003


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged

6c36f424

After merge fix · 3804913a
unknown authored Apr 03, 2003
```
sql/log_event.cc:
  Fixed a wrong && test -> &
```
3804913a
Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 39aaf940
unknown authored Apr 03, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
39aaf940
add test file for rpl_loaddata.test · 1447a459
unknown authored Apr 03, 2003

1447a459

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · ccbf1b7a

unknown authored Apr 03, 2003

into narttu.mysql.fi:/my/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged

ccbf1b7a

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 · 10e5f0cc
unknown authored Apr 03, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
```
10e5f0cc
added test for replication load data into temporary table with additional options · 92ebe178
unknown authored Apr 03, 2003
```
sql/log_event.cc:
  fix bug #183 (Replication of temporary tables not working)
```
92ebe178

test-transactions.sh: · 13509982

unknown authored Apr 03, 2003

  correct misprint in the sub test_update


sql-bench/test-transactions.sh:
  correct misprint in the sub test_update

13509982

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 · 9501b239
unknown authored Apr 03, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
```
9501b239
Updated results after merge · 009aeed4
unknown authored Apr 03, 2003

009aeed4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c5d0cccc
unknown authored Apr 03, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
```
c5d0cccc
AsWKB() function has been added. · 8f87386c
unknown authored Apr 03, 2003

8f87386c