mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/extra
History
unknown e9c64ae296 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/select.test:
  Resolve conflicts
scripts/mysqld_safe.sh:
  Resolve conflict
sql/item.cc:
  Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
  can be longer in 5.0 than 4.1.
sql/log_event.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
  Resolve conflict
2005-07-19 11:05:49 -07:00
..
yassl WL#2286 - Compile MySQL w/YASSL support 2005-07-01 20:00:59 +05:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
charset2html.c dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features 2004-11-04 22:29:00 +01:00
comp_err.c Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
Makefile.am Merge 2005-07-06 00:06:11 +02:00
my_print_defaults.c Cleanups during review 2005-07-18 15:33:18 +03:00
mysql_waitpid.c Added global my_getopt_error_reporter function pointer which is 2004-08-31 21:27:58 +05:00
perror.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
replace.c Cleanups during review 2005-07-18 15:33:18 +03:00
resolve_stack_dump.c Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
resolveip.c Merge with 4.0 2004-09-01 04:12:09 +03:00