mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/ndb/tools
History
unknown 380690316f Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).


configure.in:
  Auto merged
mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/base64.c:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
mysql-test/t/disabled.def:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  used "ul", Pekka said he'll fix
2005-11-19 10:43:28 +01:00
..
old_dirs Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
restore Import ndb varsize 2005-11-07 12:19:28 +01:00
clean-links.sh Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
delete_all.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
desc.cpp Import ndb varsize 2005-11-07 12:19:28 +01:00
drop_index.cpp Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-21 12:50:24 +02:00
drop_tab.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
listTables.cpp Import ndb varsize 2005-11-07 12:19:28 +01:00
make-errors.pl Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
make-links.sh Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Makefile.am Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-08-08 22:21:43 +02:00
ndb_condig.cpp Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
ndb_size.pl Merge mysql.com:/home/mysql_src/mysql-5.0-van 2005-11-19 10:43:28 +01:00
ndb_size.tmpl Merge mysql.com:/home/mysql_src/mysql-5.0-van 2005-11-19 10:43:28 +01:00
ndb_test_platform.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbsql.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
rgrep Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
select_all.cpp Import ndb varsize 2005-11-07 12:19:28 +01:00
select_count.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
waiter.cpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00