Commits · 01c2c0c32662f19dbb397384d361bbb32b2a4804 · Kirill Smelkov / mariadb

29 Jun, 2003 1 commit
- Merge · 01c2c0c3
  monty@mashka.mysql.fi authored Jun 29, 2003
  
  01c2c0c3
27 Jun, 2003 1 commit
- Allow one to use MERGE tables with tables from different databases · dfac0fc9
  monty@mashka.mysql.fi authored Jun 27, 2003
```
Added command 'replace_column' to mysqltest
```
  dfac0fc9
25 Jun, 2003 1 commit
- Fixed slowdown problem on windows · fff60e3a
  monty@mashka.mysql.fi authored Jun 25, 2003
  
  fff60e3a
24 Jun, 2003 5 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ebfded17
  monty@mashka.mysql.fi authored Jun 24, 2003
```
into mashka.mysql.fi:/home/my/mysql-4.1
```
  ebfded17
- indentation change · 9c607001
  monty@mashka.mysql.fi authored Jun 24, 2003
  
  9c607001
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e187e22a
  monty@narttu.mysql.fi authored Jun 24, 2003
```
into narttu.mysql.fi:/my/mysql-4.1
```
  e187e22a
- Fixed some new memory leaks · 1bd306cc
  monty@narttu.mysql.fi authored Jun 24, 2003
```
Updated VC++ files
```
  1bd306cc
- Item character set is stored in Item itself now, not in ITem->str_value · 8bd715da
  bar@bar.mysql.r18.ru authored Jun 24, 2003
  
  8bd715da
23 Jun, 2003 1 commit
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f55db178
  ram@mysql.r18.ru authored Jun 23, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1.gis
```
  f55db178
22 Jun, 2003 1 commit
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 7b7892af
  bell@sanja.is.com.ua authored Jun 23, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
```
  7b7892af
20 Jun, 2003 6 commits
- item_cmpfunc.cc: · 4c7714b7
  bar@bar.mysql.r18.ru authored Jun 20, 2003
```
  Temporarily fix for test failure
  ,.
```
  4c7714b7
- item_cmpfunc.cc: · f78a7779
  bar@bar.mysql.r18.ru authored Jun 20, 2003
```
  Rewritten in nicer way
  ,
```
  f78a7779
- - make sure that scripts/*.sql files are being added to the source · 7a6059cc
  lenz@kallisto.local authored Jun 20, 2003
```
   distribution as well
```
  7a6059cc
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · e17ad368
  bell@sanja.is.com.ua authored Jun 20, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
```
  e17ad368
- Renamed xxx_as_text() and xxx__from_text(). · a89a7eb3
  ram@mysql.r18.ru authored Jun 20, 2003
  
  a89a7eb3
- Added AsWKT() alias for AsText(). · 528386fc
  ram@mysql.r18.ru authored Jun 20, 2003
```
Renamed as_text().
```
  528386fc
19 Jun, 2003 19 commits
- Fix error msg. Bug #681 · 354af955
  miguel@hegel.(none) authored Jun 19, 2003
  
  354af955
- after merge fix · 8ac294c9
  bell@sanja.is.com.ua authored Jun 19, 2003
  
  8ac294c9
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 096ae170
  bell@sanja.is.com.ua authored Jun 19, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1
```
  096ae170
- Merge mysql.com:/space/my/mysql-4.1 · 431b08c3
  lenz@mysql.com authored Jun 19, 2003
```
into mysql.com:/space/my/mysql-4.1-build
```
  431b08c3
- Merge mysql.com:/space/my/mysql-4.1 · 6cd5eb8e
  lenz@mysql.com authored Jun 19, 2003
```
into mysql.com:/space/my/mysql-4.1-build
```
  6cd5eb8e
- - added missing include/sql_state.h to source distribution · 873f6d87
  lenz@kallisto.local authored Jun 19, 2003
  
  873f6d87
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · acdc9c59
  igor@rurik.mysql.com authored Jun 19, 2003
```
into rurik.mysql.com:/home/igor/mysql-4.1
```
  acdc9c59
- Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 8f479482
  lenz@mysql.com authored Jun 19, 2003
```
into mysql.com:/space/my/mysql-4.1
```
  8f479482
- - revert wrong include of zlib.h as zlib is not part of the source · 1908cc62
  lenz@kallisto.local authored Jun 19, 2003
```
   distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)
```
  1908cc62
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 63691e27
  igor@rurik.mysql.com authored Jun 19, 2003
```
into rurik.mysql.com:/home/igor/mysql-4.1
```
  63691e27
- Merge rurik.mysql.com:/home/igor/mysql-4.1 · 98eeaa54
  igor@rurik.mysql.com authored Jun 19, 2003
```
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
```
  98eeaa54
- preload.result, preload.test: · 3ed12d5a
  igor@rurik.mysql.com authored Jun 19, 2003
```
  Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement
```
  3ed12d5a
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · e701ece0
  bar@bar.mysql.r18.ru authored Jun 19, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  e701ece0
- - added libmysql/client_settings.h to distribution · 853c3dd7
  lenz@kallisto.local authored Jun 19, 2003
  
  853c3dd7
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 069e57bd
  bar@bar.mysql.r18.ru authored Jun 19, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  069e57bd
- LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations · ebb88ec6
  bar@bar.mysql.r18.ru authored Jun 19, 2003
  
  ebb88ec6
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5a6d0da2
  igor@rurik.mysql.com authored Jun 19, 2003
```
into rurik.mysql.com:/home/igor/mysql-4.1
```
  5a6d0da2
- These functions now return a result of proper collation: · 69af692a
  bar@bar.mysql.r18.ru authored Jun 19, 2003
```
BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE
```
  69af692a
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · f804b783
  igor@rurik.mysql.com authored Jun 18, 2003
```
into rurik.mysql.com:/home/igor/mysql-4.1
```
  f804b783
18 Jun, 2003 5 commits
- - added sql-common subdirectory and sql_common.h to source distribution · a7f584da
  lenz@kallisto.local authored Jun 18, 2003
  
  a7f584da
- Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 67779aff
  lenz@kallisto.local authored Jun 18, 2003
```
into mysql.com:/space/my/mysql-4.1
```
  67779aff
- INSTALL-WIN-SOURCE: · eeb987dd
  paul@teton.kitebird.com authored Jun 18, 2003
```
  More edits to INSTALL-WIN-SOURCE.
```
  eeb987dd
- Merge · 54255915
  igor@rurik.mysql.com authored Jun 18, 2003
  
  54255915
- triggers magic · 242ee84f
  serg@sergbook.mylan authored Jun 18, 2003
```
enforce REAL_EMAIL
```
  242ee84f