mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/client
History
unknown eeee5fb10b Merge with 4.1 
Makefile.am:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Keep old
client/mysqldump.c:
  Manual merge
client/mysqltest.c:
  Automatic merge
configure.in:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Auto merge
mysql-test/r/func_str.result:
  Auto merge
mysql-test/r/group_by.result:
  Auto merge
mysql-test/r/insert_select.result:
  Auto merge
mysql-test/r/insert_update.result:
  Auto merge
mysql-test/r/lowercase_table2.result:
  Auto merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/variables.result:
  Auto merge
mysql-test/t/ctype_ucs.test:
  Auto merge
mysql-test/t/func_str.test:
  Auto merge
mysql-test/t/group_by.test:
  Auto merge
mysql-test/t/insert_select.test:
  Auto merge
mysql-test/t/insert_update.test:
  Auto merge
mysql-test/t/ndb_alter_table.test:
  Auto merge
mysql-test/t/select.test:
  Auto merge
mysql-test/t/variables.test:
  Auto merge
mysys/my_access.c:
  Auto merge
scripts/make_win_src_distribution.sh:
  Auto merge
sql/field.cc:
  Manual merge
sql/ha_ndbcluster.cc:
  Auto merge
sql/handler.cc:
  Auto merge
sql/item.cc:
  Auto merge
sql/item.h:
  Manual merge
sql/item_cmpfunc.h:
  Auto merge
sql/item_strfunc.cc:
  Auto merge
sql/item_strfunc.h:
  Auto merge
sql/mysql_priv.h:
  manual merge
sql/mysqld.cc:
  manual merge
sql/opt_range.cc:
  manual merge
sql/set_var.cc:
  Auto merge
sql/sql_base.cc:
  manual merge
  Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_insert.cc:
  manual merge
  Restore processing of ON DUPLICATE KEY UPDATE
  Simplify mysql_prepare_insert by using local variable for select_lex and save old values just before they are changed
sql/sql_parse.cc:
  Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_prepare.cc:
  New ON DUPLICATE KEY UPDATE handling
sql/sql_select.cc:
  manual merge
sql/sql_table.cc:
  auto merge
sql/sql_yacc.yy:
  auto merge
strings/ctype-ucs2.c:
  auto merge
strings/ctype-utf8.c:
  auto merge
2005-07-03 14:17:52 +03:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Correction of merge mishandling in 'client/client_priv.h'. 2005-05-26 12:58:55 +02:00
completion_hash.cc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01:00
completion_hash.h upgrade readline to version 4.3 2002-11-19 18:26:53 +04:00
get_password.c Merge with 4.0.14 2003-08-11 22:44:43 +03:00
Makefile.am WL#2286 - Compile MySQL w/YASSL support 2005-06-12 18:18:46 +05:00
my_readline.h mysql.cc: 2004-05-05 22:47:09 +02:00
mysql.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-06-20 15:02:45 -07:00
mysqladmin.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
mysqlbinlog.cc yassl changeset 2: 2005-04-30 19:48:45 +02:00
mysqlcheck.c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-04-06 15:24:12 -07:00
mysqldump.c Merge with 4.1 2005-07-03 14:17:52 +03:00
mysqlimport.c Changing the default of libmysqlclient : it's now NO reconnection. 2004-12-09 14:44:10 +01:00
mysqlmanager-pwgen.c Merge with 4.0 2004-09-01 04:12:09 +03:00
mysqlmanagerc.c Added global my_getopt_error_reporter function pointer which is 2004-08-31 21:27:58 +05:00
mysqlshow.c Bug #10947 mysqlshow wildcard failure on Windows 2005-06-10 14:03:22 -05:00
mysqltest.c Merge with 4.1 2005-07-03 14:17:52 +03:00
readline.cc fixed conversion errors (Windows IA64 build) 2005-03-07 09:47:24 +01:00
sql_string.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_string.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00