unknown f177075e03 17926 duplicates Bug#1989 in bug db ...

on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
in 5.1 tree. backing 17926 out of 5.1 tree.


client/mysql.cc:
  Bug#17926 duplicates Bug#1989 in bug db
  
  back 17926 out of 5.1 tree

2006-08-18 19:29:54 +02:00

..

.cvsignore

…

client_priv.h

Removed double enum value.

2006-05-16 01:12:12 +03:00

CMakeLists.txt

performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.

2006-05-11 11:29:08 -05: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

This is an implementation of two WL items:

2006-05-18 18:57:50 +04:00

Makefile.am

Merge bodhi.local:/opt/local/work/tmp_merge

2006-08-12 21:06:51 +04:00

my_readline.h

mysql.cc:

2004-05-05 22:47:09 +02:00

mysql_upgrade.c

Merge bk@192.168.21.1:mysql-5.0-kt

2006-08-02 14:17:16 +05:00

mysql.cc

17926 duplicates Bug#1989 in bug db

2006-08-18 19:29:54 +02:00

mysqladmin.cc

Bug#17208 SSL: client does not verify server certificate

2006-04-18 17:58:27 +02:00

mysqlbinlog.cc

Merge bodhi.local:/opt/local/work/tmp_merge

2006-08-12 21:06:51 +04:00

mysqlcheck.c

Merge bodhi.local:/opt/local/work/tmp_merge

2006-08-12 21:06:51 +04:00

mysqldump.c

Manual merge 5.0->5.1. Post-merge fixes.

2006-08-14 13:27:11 +04:00

mysqlimport.c

Merge bodhi.local:/opt/local/work/tmp_merge

2006-08-12 21:06:51 +04:00

mysqlshow.c

Bug #19147: mysqlshow INFORMATION_SCHEMA does not work

2006-07-21 20:29:25 -07:00

mysqlslap.c

Bug#21297 rpl_insert fails randomly

2006-07-27 10:54:04 +02:00

mysqltest.c

Merge bodhi.local:/opt/local/work/tmp_merge

2006-08-12 21:06:51 +04: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