Commits · aa0545faddf0cf7ac0013ee9fe46e93fc8cf5de1 · nexedi / MariaDB

08 Apr, 2003 2 commits

Merging · aa0545fa

unknown authored Apr 08, 2003


myisam/mi_check.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  error messages trimmed
sql/share/czech/errmsg.txt:
  error messages trimmed
sql/share/danish/errmsg.txt:
  error messages trimmed
sql/share/dutch/errmsg.txt:
  error messages trimmed
sql/share/english/errmsg.txt:
  error messages trimmed
sql/share/estonian/errmsg.txt:
  error messages trimmed
sql/share/french/errmsg.txt:
  error messages trimmed
sql/share/german/errmsg.txt:
  error messages trimmed
sql/share/greek/errmsg.txt:
  error messages trimmed
sql/share/hungarian/errmsg.txt:
  error messages trimmed
sql/share/italian/errmsg.txt:
  error messages trimmed
sql/share/japanese/errmsg.txt:
  error messages trimmed
sql/share/korean/errmsg.txt:
  error messages trimmed
sql/share/norwegian-ny/errmsg.txt:
  error messages trimmed
sql/share/norwegian/errmsg.txt:
  error messages trimmed
sql/share/polish/errmsg.txt:
  error messages trimmed
sql/share/portuguese/errmsg.txt:
  error messages trimmed
sql/share/romanian/errmsg.txt:
  error messages trimmed
sql/share/russian/errmsg.txt:
  error messages trimmed
sql/share/serbian/errmsg.txt:
  error messages trimmed
sql/share/slovak/errmsg.txt:
  error messages trimmed
sql/share/spanish/errmsg.txt:
  error messages trimmed
sql/share/swedish/errmsg.txt:
  error messages trimmed
sql/share/ukrainian/errmsg.txt:
  error messages trimmed

aa0545fa

SCRUM · f162de6f

unknown authored Apr 08, 2003

two KILL versions
code trimming with headquarter's suggestions 


myisam/mi_check.c:
  killed_ptr function changed backward
myisam/myisamchk.c:
  killed_ptr function changed backward
myisam/myisamdef.h:
  killed_ptr function changed backward
myisam/sort.c:
  killed_ptr function changed backward
sql/ha_myisam.cc:
  killed_ptr function changed backward
sql/lock.cc:
  error sending trimmed
sql/log_event.cc:
  error sending trimmed
sql/records.cc:
  error sending trimmed
sql/slave.cc:
  error sending trimmed
sql/sql_class.h:
  inline functions to send right message about killing added
sql/sql_delete.cc:
  error sending trimmed
sql/sql_load.cc:
  error sending trimmed
sql/sql_parse.cc:
  error sending trimmed
sql/sql_prepare.cc:
  error sending trimmed
sql/sql_select.cc:
  error sending trimmed
sql/sql_table.cc:
  error sending trimmed
sql/sql_update.cc:
  error sending trimmed

f162de6f

04 Apr, 2003 12 commits

Post merge fixes. · d259de25

unknown authored Apr 04, 2003


mysql-test/r/sp.result:
  Enabled the cs test as it works now.
mysql-test/t/sp.test:
  Enabled the cs test as it works now.

d259de25

Merge · 9e31ab36

unknown authored Apr 04, 2003


sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  SCCS merged
sql/share/dutch/errmsg.txt:
  SCCS merged
sql/share/estonian/errmsg.txt:
  SCCS merged
sql/share/french/errmsg.txt:
  SCCS merged
sql/share/german/errmsg.txt:
  SCCS merged
sql/share/greek/errmsg.txt:
  SCCS merged
sql/share/hungarian/errmsg.txt:
  SCCS merged
sql/share/italian/errmsg.txt:
  SCCS merged
sql/share/japanese/errmsg.txt:
  SCCS merged
sql/share/korean/errmsg.txt:
  SCCS merged
sql/share/norwegian-ny/errmsg.txt:
  SCCS merged
sql/share/norwegian/errmsg.txt:
  SCCS merged
sql/share/polish/errmsg.txt:
  SCCS merged
sql/share/portuguese/errmsg.txt:
  SCCS merged
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  SCCS merged
sql/share/serbian/errmsg.txt:
  SCCS merged
sql/share/slovak/errmsg.txt:
  SCCS merged
sql/share/spanish/errmsg.txt:
  SCCS merged
sql/share/swedish/errmsg.txt:
  SCCS merged
sql/share/ukrainian/errmsg.txt:
  SCCS merged

9e31ab36

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

Merging 4.1 to 5.0. · d021b5a5

unknown authored Apr 04, 2003


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

d021b5a5

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 26 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

Fixed the last memory leaks in the SP code. · d8be4d86

unknown authored Apr 03, 2003


sql/sp.cc:
  Fixed clear_function_cache bug that made memory freeing work for functions too.
sql/sp_head.cc:
  Added more DBUG output to help finding memory leak.
sql/sql_parse.cc:
  Moved sp_clear_function_cache call so it *works*.
  Added missing memory freeing call.

d8be4d86

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
Got rid of the last unecessary Item_strings. · 482218c1
unknown authored Apr 03, 2003

482218c1
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
Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 · b0a44313
unknown authored Apr 03, 2003
```
mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
```
b0a44313
Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) · cd30004b
unknown authored Apr 03, 2003
```
mysys/my_vsnprintf.c:
  safety fix
sql/log.cc:
  safety fix
```
cd30004b

sql_cache.cc: · 5f5f2a67

unknown authored Apr 03, 2003

  Windows compilation fix


sql/sql_cache.cc:
  Windows compilation fix

5f5f2a67

Merge with 3.23 to get fixes for: · c0f0f434

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

c0f0f434

Portability fix (for AMD hammer) · c301d04b
unknown authored Apr 03, 2003
```
sql/log.cc:
  Portability fix (for hammer)
```
c301d04b