mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client
History
unknown a69a96e26a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


client/mysqltest.c:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_wincond.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  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/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
client/mysql_upgrade.c:
  Manual merge; I chose to keep Magnus' changes because they make the code
  more simple; always use *only* the option file created by mysql_upgrade.
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Manual merge
mysql-test/r/binlog_row_ctype_cp932.result:
  Manual merge
mysql-test/r/binlog_stm_ctype_cp932.result:
  Manual merge
mysql-test/r/mysqlbinlog.result:
  Manual merge
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Manual merge
mysql-test/t/mysqlbinlog.test:
  Manual merge
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Manual merge
2007-03-07 07:21:24 +01:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 2007-01-29 13:17:30 -08:00
CMakeLists.txt Add echo to be compiled 2007-02-16 15:33:54 +01:00
completion_hash.cc Many files: 2006-12-23 20:17:15 +01:00
completion_hash.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
echo.c Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 2007-02-16 15:19:38 +01:00
get_password.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Makefile.am Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 2007-02-19 13:22:18 +01:00
my_readline.h Many files: 2006-12-23 20:17:15 +01:00
mysql.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-21 14:07:08 +02:00
mysql_upgrade.c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-03-07 07:21:24 +01:00
mysqladmin.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
mysqlbinlog.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-02-25 00:12:14 +01:00
mysqlcheck.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mysqldump.c Fixed compiler warnings 2007-02-23 13:13:55 +02:00
mysqlimport.c After merge fixes 2007-01-29 01:47:35 +02:00
mysqlshow.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
mysqlslap.c Fixed bug#26027 2007-02-04 15:31:35 -08:00
mysqltest.c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 2007-03-01 14:53:32 +01:00
readline.cc Many files: 2006-12-23 20:17:15 +01:00
sql_string.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
sql_string.h Fixed compiler warnings 2007-02-23 13:13:55 +02:00