Commits · 1e191736d6ddf9dc70d6f430921588fdb6aecf91 · nexedi / MariaDB

27 Feb, 2004 1 commit

my_gethwaddr() for linux/freebsd · 1e191736

unknown authored Feb 27, 2004

UUID() function


BitKeeper/etc/ignore:
  Added mysys/test_gethwaddr to the ignore list
include/my_sys.h:
  my_gethwaddr()
mysys/Makefile.am:
  my_gethwaddr
sql/item_create.cc:
  UUID() function
sql/item_create.h:
  UUID() function
sql/item_strfunc.cc:
  UUID() function
sql/item_strfunc.h:
  UUID() function
sql/lex.h:
  UUID() function
sql/mysql_priv.h:
  UUID() function
sql/mysqld.cc:
  UUID() function
sql/sql_class.cc:
  cleanup

1e191736

25 Feb, 2004 1 commit
- Merge bk-internal:/home/bk/mysql-4.1/ · bda31222
  unknown authored Feb 26, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  Auto merged
```
  bda31222
24 Feb, 2004 4 commits
- in netware ':' is also a valid path character · 056a678d
  unknown authored Feb 24, 2004
  
  056a678d
- Code cleanup · f96960f9
  unknown authored Feb 24, 2004
  
  f96960f9
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 83188d50
  unknown authored Feb 24, 2004
```
into mashka.mysql.fi:/home/my/mysql-4.1


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

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

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

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

07b40e62

Updated results · a594279d
unknown authored Feb 22, 2004

a594279d
Merge with 4.0 to get fixed tests · 54cefbab
unknown authored Feb 22, 2004
```
mysql-test/t/lock_tables_lost_commit.test:
  Auto merged
```
54cefbab
Move tests that uses innodb to innodb.test · 2100d85c
unknown authored Feb 22, 2004
```
mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in
```
2100d85c

merge with 4.0 · 192bf819

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

192bf819

Cleanups · 522e83b6

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

522e83b6

After merge fixes · 984750e1

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

984750e1

21 Feb, 2004 11 commits

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


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

e06fbc57
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · 62b22fb7
unknown authored Feb 21, 2004
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
62b22fb7
making one symbol a keyword · 3dcd3d4b
unknown authored Feb 21, 2004

3dcd3d4b
typo fixed · 76b80b66
unknown authored Feb 21, 2004

76b80b66
c++ comment fixed · ecf6eeca
unknown authored Feb 21, 2004

ecf6eeca

ignore: · ff76e674

unknown authored Feb 21, 2004

  added scripts/make_win_binary_distribution


BitKeeper/etc/ignore:
  added scripts/make_win_binary_distribution

ff76e674

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

ha_innodb.cc, data0type.c, data0type.ic, data0type.h: · 4e17890f

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

4e17890f

data0type.ic, data0type.h: · 7934897a

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

7934897a

20 Feb, 2004 13 commits

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

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

e8ae2f52

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

longer myisam keys · 74fa5f09

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

74fa5f09

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

merge with 4.0 to get security fixes and latest bug fixes · 8b2b219f

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

8b2b219f

Fix name conflict with alternate capitalization · 40b8593d

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

40b8593d

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

Remove unused files · c198934d

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

c198934d

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


innobase/que/que0que.c:
  Auto merged
```
661c40fb

Many files: · 0eacf58f

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

0eacf58f

after review changes · 9977ce0c

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

9977ce0c