Commits · cfc9c5a20841713bdb65620440575957073faf68 · nexedi / MariaDB

24 Feb, 2004 3 commits
- Code cleanup · cfc9c5a2
  unknown authored Feb 24, 2004
  
  cfc9c5a2
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · edba0b83
  unknown authored Feb 24, 2004
```
into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
```
  edba0b83
- minor omission that effectively disabled my_strtod fixed :) · 35dfb021
  unknown authored Feb 24, 2004
```
mysql-test/r/bigint.result:
  updated
mysql-test/r/func_misc.result:
  updated
mysql-test/t/bigint.test:
  updated
```
  35dfb021
23 Feb, 2004 2 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 074ba8e9
  unknown authored Feb 23, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  074ba8e9
- missing break added · f476ae5a
  unknown authored Feb 23, 2004
  
  f476ae5a
22 Feb, 2004 8 commits

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · f226959d
unknown authored Feb 22, 2004
```
into eagle.mysql.r18.ru:/home/vva/work/BUG_2719/mysql-4.1
```
f226959d

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

unknown authored Feb 22, 2004

into mashka.mysql.fi:/home/my/mysql-4.1


innobase/rem/rem0cmp.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

089e573b

Updated results · c7c7cb78
unknown authored Feb 22, 2004

c7c7cb78
Merge with 4.0 to get fixed tests · 7c67466d
unknown authored Feb 22, 2004
```
mysql-test/t/lock_tables_lost_commit.test:
  Auto merged
```
7c67466d
Move tests that uses innodb to innodb.test · ed27c912
unknown authored Feb 22, 2004
```
mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in
```
ed27c912

merge with 4.0 · bdaf5c2b

unknown authored Feb 22, 2004


BitKeeper/etc/ignore:
  auto-union
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisampack/myisampack.dsp:
  Auto merged
acinclude.m4:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/com/com0shm.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/ibuf0ibuf.h:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0proc.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0proc.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

bdaf5c2b

Cleanups · 1052b612

unknown authored Feb 22, 2004


acinclude.m4:
  Remove innobase/libodbc
innobase/Makefile.am:
  Remove innobase/libodbc
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fixed wrong merge

1052b612

After merge fixes · 416dc3b4

unknown authored Feb 22, 2004

Fixed wrong test of database name (affected optimization of ORDER BY)


VC++Files/client/mysqlclient.dsp:
  Add my_file.c
VC++Files/mysys/mysys.dsp:
  Add my_file.c
mysql-test/r/negation_elimination.result:
  Fix wrong test
sql-common/client.c:
  After merge fix
sql/sql_base.cc:
  Fixed testing of database name

416dc3b4

21 Feb, 2004 11 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 4e755a8c
unknown authored Feb 22, 2004
```
into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
```
4e755a8c
change that master_server_id is not a restricted word · ba423a11
unknown authored Feb 22, 2004

ba423a11
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · bd8cf146
unknown authored Feb 21, 2004
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
bd8cf146
making one symbol a keyword · e8089a27
unknown authored Feb 21, 2004

e8089a27
typo fixed · ba250297
unknown authored Feb 21, 2004

ba250297
c++ comment fixed · 4ca5eb30
unknown authored Feb 21, 2004

4ca5eb30

ignore: · 484a1dc8

unknown authored Feb 21, 2004

  added scripts/make_win_binary_distribution


BitKeeper/etc/ignore:
  added scripts/make_win_binary_distribution

484a1dc8

Merge bk-internal:/home/bk/mysql-4.0/ · bd640d86
unknown authored Feb 21, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
bd640d86
portability fixes · 726414e6
unknown authored Feb 21, 2004
```
cleanup
```
726414e6

ha_innodb.cc, data0type.c, data0type.ic, data0type.h: · 490e2fd7

unknown authored Feb 21, 2004

Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois

innobase/include/data0type.h:
Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
innobase/include/data0type.ic:
Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
innobase/data/data0type.c:
Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
sql/ha_innodb.cc:
Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois

490e2fd7

data0type.ic, data0type.h: · f1164197

unknown authored Feb 21, 2004

Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions

innobase/include/data0type.h:
Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions
innobase/include/data0type.ic:
Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions

f1164197

20 Feb, 2004 16 commits

fix for --open-files-limit and broken query_cache_merge.test · acfb39e4

unknown authored Feb 20, 2004


mysys/my_init.c:
  #include moved to mysys_priv.h
mysys/mysys_priv.h:
  #include moved to mysys_priv.h
sql/hostname.cc:
  removed unnecessary #include

acfb39e4

Merge bk-internal:/home/bk/mysql-4.1/ · c46934d9
unknown authored Feb 20, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
c46934d9

longer myisam keys · 9eaf0fa6

unknown authored Feb 20, 2004


mysql-test/r/ctype_utf8.result:
  updated
mysql-test/r/key.result:
  updated
mysql-test/r/myisam.result:
  updated
mysql-test/r/type_blob.result:
  updated
mysql-test/t/ctype_utf8.test:
  updated
mysql-test/t/key.test:
  updated
mysql-test/t/myisam.test:
  updated
mysql-test/t/type_blob.test:
  updated

9eaf0fa6

Merge mysql.com:/space/my/mysql-4.1 · c8b82d15
unknown authored Feb 20, 2004
```
into mysql.com:/space/my/mysql-4.1-build
```
c8b82d15
- when removing the readline subdir for the commercial distribution, · 13212fbf
unknown authored Feb 20, 2004
```
   configure.in needs to be updated and configure needs to be recreated
   for the build to succed
```
13212fbf
Added missing argument to strxnmov() (Applies for windows debug mode) · 1da0c854
unknown authored Feb 20, 2004
```
libmysql/libmysql.c:
  Added missing argument to strxnmov()
```
1da0c854

merge with 4.0 to get security fixes and latest bug fixes · 526b880f

unknown authored Feb 20, 2004


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/srv0start.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysql/manager.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Removed wrong define USE_SYMLINK
include/config-win.h:
  Use original code
innobase/srv/srv0srv.c:
  merge
innobase/usr/usr0sess.c:
  merge
libmysql/libmysql.c:
  merge
mysql-test/r/func_test.result:
  merge
mysql-test/t/func_test.test:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge

526b880f

Fix name conflict with alternate capitalization · 20052e66

unknown authored Feb 20, 2004

VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old:
Rename: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old:
Rename: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old:
Rename: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old

20052e66

Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 · c744bd65
unknown authored Feb 20, 2004
```
into mysql.com:/bk/mysql-4.0
```
c744bd65

Remove unused files · 415012e8

unknown authored Feb 20, 2004

.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c
.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am


BitKeeper/deleted/.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am
BitKeeper/deleted/.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
BitKeeper/deleted/.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
BitKeeper/deleted/.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c

415012e8

Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 474bc851
unknown authored Feb 20, 2004
```
into hundin.mysql.fi:/home/marko/m/mysql-4.0


innobase/que/que0que.c:
  Auto merged
```
474bc851

Many files: · 04a7c9eb

unknown authored Feb 20, 2004

  Removed unused code
.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
dict0crea.c:
  Protect all sprintf(%s) with assertions


BitKeeper/deleted/.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
innobase/btr/btr0sea.c:
  Removed unused code
innobase/buf/buf0buf.c:
  Removed unused code
innobase/com/com0shm.c:
  Removed unused code
innobase/data/data0data.c:
  Removed unused code
innobase/dict/dict0crea.c:
  Removed unused code
innobase/fsp/fsp0fsp.c:
  Removed unused code
innobase/ha/ha0ha.c:
  Removed unused code
innobase/include/btr0cur.h:
  Removed unused code
innobase/include/btr0sea.h:
  Removed unused code
innobase/include/buf0buf.ic:
  Removed unused code
innobase/include/data0data.h:
  Removed unused code
innobase/include/dict0crea.h:
  Removed unused code
innobase/include/dict0dict.h:
  Removed unused code
innobase/include/ibuf0ibuf.h:
  Removed unused code
innobase/include/lock0lock.h:
  Removed unused code
innobase/include/mem0dbg.h:
  Removed unused code
innobase/include/mem0mem.ic:
  Removed unused code
innobase/include/mtr0log.h:
  Removed unused code
innobase/include/mtr0mtr.h:
  Removed unused code
innobase/include/os0proc.h:
  Removed unused code
innobase/include/os0thread.h:
  Removed unused code
innobase/include/rem0cmp.ic:
  Removed unused code
innobase/include/row0row.h:
  Removed unused code
innobase/include/srv0srv.h:
  Removed unused code
innobase/include/sync0sync.h:
  Removed unused code
innobase/lock/lock0lock.c:
  Removed unused code
innobase/log/log0recv.c:
  Removed unused code
innobase/mem/mem0dbg.c:
  Removed unused code
innobase/mtr/mtr0mtr.c:
  Removed unused code
innobase/os/os0proc.c:
  Removed unused code
innobase/page/page0page.c:
  Removed unused code
innobase/que/que0que.c:
  Removed unused code
innobase/rem/rem0cmp.c:
  Removed unused code
innobase/row/row0ins.c:
  Removed unused code
innobase/row/row0mysql.c:
  Removed unused code
innobase/row/row0row.c:
  Removed unused code
innobase/srv/srv0srv.c:
  Removed unused code
innobase/srv/srv0start.c:
  Removed unused code
innobase/sync/sync0sync.c:
  Removed unused code
innobase/trx/trx0rec.c:
  Removed unused code
innobase/trx/trx0trx.c:
  Removed unused code
innobase/ut/ut0dbg.c:
  Removed unused code
innobase/ut/ut0mem.c:
  Removed unused code
innobase/ut/ut0ut.c:
  Removed unused code

04a7c9eb

after review changes · cade9a97

unknown authored Feb 20, 2004


sql/sql_class.h:
  changed methods names
sql/sql_prepare.cc:
  changed methods names
  removed incorrect comments
  added error handler

cade9a97

after review fix · ebebf515

unknown authored Feb 20, 2004


sql/item.h:
  typo fixed
sql/item_func.h:
  clear refernce on deleted variable
sql/item_subselect.cc:
  layout fixed
sql/sql_base.cc:
  temporary memory pool allocation moved from open_and_lock_tables
sql/sql_prepare.cc:
  temporary memory pool allocation moved
  changing in routine suggeted by Monty
tests/client_test.c:
  uncomment accidently commented test

ebebf515

Merge bk-internal:/home/bk/mysql-4.0/ · 117e8990
unknown authored Feb 20, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
117e8990
\| is sed is on-portable · 48ba2149
unknown authored Feb 20, 2004

48ba2149