mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
History
unknown 00080b90f7 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge


mysql-test/lib/init_db.sql:
  Auto merged
mysql-test/r/1st.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/r/sp.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
mysql-test/r/sp_gis.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
2006-12-08 22:30:18 -05:00
..
archive Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
blackhole Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
csv Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
example Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08:00
federated Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2006-12-08 22:30:18 -05:00
heap Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02:00
innobase This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
myisam Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-12-09 02:34:42 +01:00
myisammrg Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
ndb Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-12-05 19:19:58 +01:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00