mariadb/client
unknown e54ecf09be Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
sql/sql_rename.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
2006-02-27 20:00:07 +03:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
client_priv.h client_priv.h: 2006-02-17 13:10:12 +04: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 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 2006-02-20 13:04:40 +01:00
my_readline.h mysql.cc: 2004-05-05 22:47:09 +02:00
mysql.cc BUG#16217 forced to introduce a separate mysql client command to adopt its 2006-02-09 16:23:09 +02:00
mysqladmin.cc many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
mysqlbinlog.cc Changes to make testsuite run in CMake build tree. 2006-02-10 13:29:01 +01:00
mysqlcheck.c Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 2006-02-17 08:33:47 -06:00
mysqldump.c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2006-02-23 16:11:47 +01:00
mysqlimport.c This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break). 2006-02-25 18:03:11 -08: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 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2005-12-04 15:34:47 +02:00
mysqlslap.c This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break). 2006-02-25 18:03:11 -08:00
mysqltest.c Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 2006-02-27 20:00:07 +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