Commits · b9b15d52393f9aa33fbb6a6fdc40c8df75aadb81 · Kirill Smelkov / mariadb

07 Apr, 2003 3 commits
- sys_var_collation is now abstract class · b9b15d52
  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.
```
  b9b15d52
- New methods to store strings with "convert to" argimument · 65ae25d0
  unknown authored Apr 07, 2003
  
  65ae25d0
- fixed bug with locales in libedit · 3aa55997
  unknown authored Apr 06, 2003
```
configure.in:
  fixed bug with external libedit
```
  3aa55997
05 Apr, 2003 8 commits

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


sql/sql_yacc.yy:
  Auto merged
```
9a4258b4

Some optimization in SET NAMES · 0ee98167

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

0ee98167

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


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

sql_yacc.yy: · a00dbd11

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!

a00dbd11

sql_yacc.yy, set_var.h, set_var.cc: · a7a96235

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

a7a96235

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 740adf71

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

740adf71

fixed st_select_lex initialization · 933e16a3

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

933e16a3

sql_cache.cc: · 1f61635d

unknown authored Apr 05, 2003

  Cast to unsigned char


sql/sql_cache.cc:
  Cast to unsigned char

1f61635d

04 Apr, 2003 9 commits

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

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

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/).

f3f0fb58

Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 7ad9f7c4
unknown authored Apr 04, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
7ad9f7c4
Index.xml: · 48572f03
unknown authored Apr 04, 2003
```
  Type


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


sql/item_strfunc.cc:
  Auto merged
```
a9ca18f5
Fixed envelope() function. · f6c5bade
unknown authored Apr 04, 2003

f6c5bade
Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect). · 1b69b763
unknown authored Apr 04, 2003

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

03 Apr, 2003 20 commits

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

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

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

field.cc: · 7b85e459

unknown authored Apr 03, 2003

  Geometry is now large blob


sql/field.cc:
  Geometry is now large blob

7b85e459

Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) · 0dbfff46

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

0dbfff46

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

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

c9d2e775

Merge with 4.0 · 6b8e2938

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

6b8e2938

After merge fix · dba3a0b0
unknown authored Apr 03, 2003
```
sql/log_event.cc:
  Fixed a wrong && test -> &
```
dba3a0b0
Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 41ce5aaa
unknown authored Apr 03, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
41ce5aaa
add test file for rpl_loaddata.test · 5b67416a
unknown authored Apr 03, 2003

5b67416a

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

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

5f5b6a7c

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

test-transactions.sh: · 12e7f167

unknown authored Apr 03, 2003

  correct misprint in the sub test_update


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

12e7f167

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

1834b6ff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4bf227c8
unknown authored Apr 03, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
```
4bf227c8
AsWKB() function has been added. · 7835ff50
unknown authored Apr 03, 2003

7835ff50
Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 · 7bc65cd8
unknown authored Apr 03, 2003
```
mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
```
7bc65cd8