mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/innobase
History
unknown 9ea1d5e293 Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues. 


BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  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/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  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
sql/examples/ha_tina.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
configure.in:
  Fixed the resolve of versions.
mysql-test/r/alter_table.result:
  Fixed results.
2005-08-30 14:40:02 -07:00
..
btr Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
buf Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
data Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-21 08:49:21 +02:00
db Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
dict Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-21 08:49:21 +02:00
dyn Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
eval Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
fil Merge 2005-07-12 20:01:22 +02:00
fsp Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-21 08:49:21 +02:00
fut Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ha Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ibuf Merge 2005-07-12 20:01:22 +02:00
include Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
lock Merge zim.(none):/home/brian/mysql/mysql-5.0 2005-08-30 14:40:02 -07:00
log Merge 2005-07-12 20:01:22 +02:00
mach Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mem Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mtr Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-21 08:49:21 +02:00
os Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
page Merge 2005-07-12 20:01:22 +02:00
pars Merge dl145c:tomas/mysql-5.0 2005-06-17 14:22:33 +02:00
que Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
read Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
rem Merge 2005-07-12 20:01:22 +02:00
row Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
srv Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
sync Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-22 02:56:25 +02:00
thr Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
trx Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
usr Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ut Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-21 08:49:21 +02:00
configure.in Merge 2005-07-12 20:01:22 +02:00
Makefile.am Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
makefilewin Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
my_cnf Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00