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/config/ac-macros
History
unknown 41de6f9a7c Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/r/ps_1general.result:
  merge ("ul", will fix)
sql/examples/ha_tina.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/handler.h:
  merge
sql/log.cc:
  merge
sql/set_var.cc:
  merge
sql/share/errmsg.txt:
  merge (bad, will fix)
sql/sql_show.cc:
  merge (bad, will fix)
sql/sql_yacc.yy:
  merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  merge
2005-11-18 16:38:01 +01:00
..
alloca.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
character_sets.m4 Many files: 2005-09-12 19:35:50 +05:00
check_cpu.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
compiler_flag.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
ha_archive.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
ha_berkeley.m4 Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
ha_blackhole.m4 Adding rules for building blackhole, also updating test case. 2005-03-25 13:43:42 -08:00
ha_example.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
ha_federated.m4 Fixed a typo in the configure --help menu. 2005-09-06 23:32:00 -07:00
ha_innodb.m4 All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
ha_ndbcluster.m4 Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
ha_partition.m4 Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
ha_tina.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
large_file.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
misc.m4 Better AR guessing. 2005-06-22 16:29:21 +05:00
openssl.m4 Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 2005-04-26 12:16:12 +02:00
readline.m4 Fix for Bug#3982 2005-09-14 21:47:24 -07:00
storage.m4 Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
yassl.m4 Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 2005-10-28 11:45:30 +02:00
zlib.m4 config/ac-macros/zlib.m4 2005-11-01 20:49:02 +01:00