Commits · 094d141b106bf0b2bdedc0494376528e6b8f0015 · nexedi / MariaDB

04 Apr, 2003 5 commits
- 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 26 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
Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) · 2090bc6e
unknown authored Apr 03, 2003
```
mysys/my_vsnprintf.c:
  safety fix
sql/log.cc:
  safety fix
```
2090bc6e

sql_cache.cc: · d352328a

unknown authored Apr 03, 2003

  Windows compilation fix


sql/sql_cache.cc:
  Windows compilation fix

d352328a

Merge with 3.23 to get fixes for: · f5feb337

unknown authored Apr 03, 2003

mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23

f5feb337

Portability fix (for AMD hammer) · 68fc04c4
unknown authored Apr 03, 2003
```
sql/log.cc:
  Portability fix (for hammer)
```
68fc04c4
Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · e9635c95
unknown authored Apr 03, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
e9635c95
Safer stack checking · 584b4caa
unknown authored Apr 03, 2003

584b4caa

02 Apr, 2003 9 commits

correct code of warning of group_concat · 1e8cc909
unknown authored Apr 02, 2003

1e8cc909
mysqld.cc: · 0f2e3ab8
unknown authored Apr 02, 2003
```
  missing comma


sql/mysqld.cc:
  missing comma
```
0f2e3ab8
Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b2fe3588
unknown authored Apr 02, 2003
```
into kishkin.ru:/home/wax/mysql-4n
```
b2fe3588

resolve new updates group_concat · 6adb27c6

unknown authored Apr 02, 2003


include/mysqld_error.h:
  resolve error message
sql/mysqld.cc:
  resolve option
sql/set_var.cc:
  resolve variable
sql/share/english/errmsg.txt:
  resolve error message
sql/sql_class.h:
  resolve

6adb27c6

Merge mysql.com:/space/my/mysql-4.1 · d8dd1cea
unknown authored Apr 02, 2003
```
into mysql.com:/space/my/mysql-4.1-build
```
d8dd1cea

- increased bdb_max_lock value to pass sql-bench · 59e8c553

unknown authored Apr 02, 2003

 - re-enabled OpenSSL for the Max RPM package


Build-tools/Do-compile:
   - increased bdb_max_lock value from 60000 -> 240000
     (got many errors "Lock table is out of available locks" when running
     sql-bench with InnoDB)
support-files/mysql.spec.sh:
   - re-enabled OpenSSL for the 4.1 Max RPM

59e8c553

Auto merged · aee0d02a
unknown authored Apr 02, 2003
```
BitKeeper/etc/logging_ok:
  auto-union
```
aee0d02a

SCRUM · 6feda00d

unknown authored Apr 02, 2003

correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL


mysql-test/r/func_gconcat.result:
  change work with NULL
mysql-test/t/func_gconcat.test:
  add test on NULL
sql/item_sum.cc:
  correct sql_alloc, ORDER BY and NULL value
  add comments
sql/sql_class.h:
  move test msg_arg

6feda00d

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69b8b99a
unknown authored Apr 02, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
```
69b8b99a