mariadb/client
unknown 2eecc377a6 Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc
merged manually by guilhem.


client/mysqlbinlog.cc:
  Post-merge fixes; manually merged by guilhem.
include/mysqld_error.h:
  Post-merge fixes.
mysql-test/r/drop_temp_table.result:
  Post-merge fixes.
mysql-test/r/insert.result:
  Post-merge fixes.
mysql-test/r/mysqlbinlog.result:
  Post-merge fixes.
mysql-test/r/query_cache.result:
  Post-merge fixes.
mysql-test/r/rpl_error_ignored_table.result:
  Post-merge fixes.
mysql-test/r/rpl_relayrotate.result:
  Post-merge fixes.
mysql-test/r/rpl_trunc_binlog.result:
  Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes.
mysql-test/r/sp.result:
  Post-merge fixes.
mysql-test/r/system_mysql_db.result:
  Post-merge fixes.
mysql-test/r/variables.result:
  Post-merge fixes.
mysql-test/t/rpl_error_ignored_table.test:
  Post-merge fixes.
mysql-test/t/sp-error.test:
  Post-merge fixes.
sql/ha_innodb.cc:
  Post-merge fixes.
sql/log_event.cc:
  Post-merge fixes; manually merged by guilhem.
sql/set_var.cc:
  Post-merge fixes.
sql/share/danish/errmsg.txt:
  Post-merge fixes.
sql/share/dutch/errmsg.txt:
  Post-merge fixes.
sql/share/english/errmsg.txt:
  Post-merge fixes.
sql/share/estonian/errmsg.txt:
  Post-merge fixes.
sql/sp.cc:
  Post-merge fixes.
sql/sql_insert.cc:
  Post-merge fixes.
sql/sql_table.cc:
  Post-merge fixes.
2004-04-28 12:08:54 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h Added option --set-charset (disable with --skip-set-charset) to mysqldump. 2004-03-31 05:36:29 +03:00
completion_hash.cc upgrade readline to version 4.3 2002-11-19 18:26:53 +04: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 Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
my_readline.h Update copyright 2001-12-06 14:10:51 +02:00
mysql.cc Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
mysqladmin.c merge fixes (use old code) 2004-03-18 00:16:04 +02:00
mysqlbinlog.cc Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc 2004-04-28 12:08:54 +02:00
mysqlcheck.c mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: 2004-02-11 15:15:39 +04:00
mysqldump.c Added option --set-charset (disable with --skip-set-charset) to mysqldump. 2004-03-31 05:36:29 +03:00
mysqlimport.c mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: 2004-02-11 15:15:39 +04:00
mysqlmanager-pwgen.c consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
mysqlmanagerc.c Big code cleanup/review before 4.0.2 release. 2002-06-11 11:20:31 +03:00
mysqlshow.c consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
mysqltest.c Fixed charsetnr sent to the client 2004-04-06 19:57:33 +05:00
readline.cc Added macros for nice TIMESPEC usage. 2002-01-02 21:29:41 +02:00
sql_string.cc just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
sql_string.h Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol 2003-06-14 11:37:42 +03:00