mariadb/mysql-test/lib
unknown d6df18dd33 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
2008-03-12 11:19:46 +03:00
..
My WL#3949 Test should set binlog format dnamically 2007-11-23 13:29:31 +01:00
mtr_cases.pl Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 2008-02-06 16:16:49 +01:00
mtr_diff.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_gcov.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_gprof.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_im.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_io.pl BUG#25659 - memory leak via "plugins" test 2007-05-21 17:48:29 +05:00
mtr_match.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_misc.pl WL#3949, second part. Added soft switching of the binlog format (w/o restart a server) 2007-11-20 19:55:51 +03:00
mtr_process.pl Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 2007-08-03 12:52:31 +02:00
mtr_report.pl Merge kaamos.(none):/data/src/mysql-5.1 2008-02-17 14:57:01 +03:00
mtr_stress.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_timer.pl Remove unecessary use of "Socket" 2007-08-24 13:10:34 +02:00
mtr_unique.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00