mariadb/innobase
unknown a48380cd9a Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


client/mysqlimport.c:
  Auto merged
include/config-netware.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
netware/mysqld_safe.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Merged from 4.1.
sql/sql_base.cc:
  Merged from 4.1.
sql/sql_handler.cc:
  Merged from 4.1.
sql/sql_select.cc:
  Merged from 4.1.
2006-01-12 20:28:23 +02:00
..
btr Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for 2005-12-13 21:35:24 +03:00
buf Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
data Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
db
dict Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for 2005-12-12 21:06:59 +03:00
dyn
eval
fil Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
fsp Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
fut
ha
ibuf Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
include Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for 2005-12-13 21:35:24 +03:00
lock Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
log Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
mach
mem Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
mtr Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
os Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2006-01-12 20:28:23 +02:00
page Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
pars Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
que Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
read Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
rem Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for 2005-12-12 21:06:59 +03:00
row Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for 2005-12-13 21:35:24 +03:00
srv Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for 2005-12-13 21:35:24 +03:00
sync Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
thr
trx Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
usr
ut Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
configure.in
Makefile.am