mariadb/include
unknown baad44b9e1 Merge mysql.com:/home/jimw/my/mysql-5.0-5906
into  mysql.com:/home/jimw/my/mysql-5.0-clean


libmysql/libmysql.c:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/strict.result:
  Resolve conflict
mysql-test/t/strict.test:
  Resolve conflict
2005-07-19 19:59:34 -07:00
..
.cvsignore
config-netware.h Applied some Netware related patches. 2005-06-29 14:02:11 +03:00
config-os2.h
config-win.h Cleanups during review 2005-07-18 15:33:18 +03:00
decimal.h A lot of fixes to Precision math 2005-05-05 20:06:49 +05:00
errmsg.h A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 2005-05-16 18:27:21 +04:00
ft_global.h indexless boolean fulltext search was depending on default_charset_info - Bug#8159 2005-02-04 15:24:06 +01:00
hash.h Followup: rename the declaration (hash_reset -> my_hash_reset) 2005-01-11 13:57:07 +03:00
heap.h Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way 2005-03-16 01:15:45 +02:00
help_end.h Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
help_start.h Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
keycache.h Final patch for BUG#4285. 2005-01-19 12:55:54 +02:00
m_ctype.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00
m_string.h Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
Makefile.am remove the rest of isam/merge references 2005-04-05 13:17:49 +02:00
md5.h
my_aes.h
my_alarm.h
my_alloc.h
my_base.h Bug#8321 - myisampack bug in compression algorithm 2005-06-24 19:34:55 +02:00
my_bitmap.h Bug#10932 - Building server with key limit of 128, makes test cases fail 2005-07-19 14:13:56 +02:00
my_dbug.h Fixed bug from last push 2005-05-18 21:12:59 +03:00
my_dir.h
my_getopt.h
my_global.h Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
my_handler.h A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
my_list.h
my_net.h BUG#7384 IM fails to compile on Solaris. 2004-12-18 03:21:20 +03:00
my_no_pthread.h
my_nosys.h
my_pthread.h Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 2005-04-27 13:30:00 +02:00
my_semaphore.h
my_sys.h Fixes to previous changeset 2005-07-18 20:05:30 +03:00
my_time.h Fix number to date conversion so it always honors the NO_ZERO_DATE, 2005-07-18 16:12:44 -07:00
my_tree.h
my_xml.h
myisam.h Bug#10932 - Building server with key limit of 128, makes test cases fail 2005-07-19 14:13:56 +02:00
myisammrg.h
myisampack.h
mysql.h Restore previous used client charset in mysql_reconnect 2005-07-16 07:13:40 +02:00
mysql_com.h Merge mysql.com:/home/jimw/my/mysql-5.0-10214 2005-07-05 09:47:20 -07:00
mysql_embed.h remove the rest of isam/merge references 2005-04-05 13:17:49 +02:00
mysql_time.h
mysql_version.h.in
mysys_err.h Show all generated warnings in SHOW ERROR 2005-02-24 23:33:42 +02:00
queues.h Fix for BUG#4177: 2004-11-21 11:51:19 +03:00
raid.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
rijndael.h
sha1.h
sql_common.h
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h
thr_lock.h A fix and a test case for Bug#10760 and complementary cleanups. 2005-07-19 22:21:12 +04:00
typelib.h
violite.h Merge bk-internal.mysql.com:/users/rburnett/bug9721 2005-05-06 15:15:48 +02:00