unknown 46cb15ccd4 SCRUM ...

merged conflicts about my previous commit
it seems there are some errors left - gonna check...


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
include/sql_common.h:
  Auto merged
include/mysql.h:
  conflicts merged
libmysql/client_settings.h:
  conflicts merged
libmysql/libmysql.c:
  conflicts merged
sql-common/client.c:
  conflicts merged
sql/client_settings.h:
  conflicts merged
sql/protocol.cc:
  conflict merged

2003-06-17 21:53:13 +05:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

config-netware.h

Changes from Novell for various NetWare-only files, post-4.0.12

2003-03-21 15:43:38 -05:00

config-os2.h

Merge with 3.23.51

2002-07-25 22:46:28 +03:00

config-win.h

merge with public tree

2003-06-05 00:12:45 +03:00

errmsg.h

Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)

2003-01-23 21:49:28 +02:00

ft_global.h

After merge fixes & remove compiler warnings

2003-02-07 15:47:24 +02:00

hash.h

Some optimization in CHARSET_INFO:

2003-04-01 12:45:16 +05:00

heap.h

auto_increment for heap tables

2002-10-07 17:49:03 +05:00

m_ctype.h

MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)

2003-06-03 14:59:17 +05:00

m_string.h

Added SQLSTATE to client/server protocol

2003-06-04 18:28:51 +03:00

Makefile.am

Merge with 4.0.13

2003-05-19 16:35:49 +03:00

md5.h

Update copyright

2001-12-06 14:10:51 +02:00

merge.h

Update copyright

2001-12-06 14:10:51 +02:00

my_aes.h

Made keyread (key scanning) a key specific attribute.

2002-06-19 00:22:30 +03:00

my_alarm.h

Update copyright

2001-12-06 14:10:51 +02:00

my_alloc.h

Small improvement to alloc_root

2002-11-16 20:19:10 +02:00

my_base.h

Merge with 4.0.13

2003-05-19 16:35:49 +03:00

my_bitmap.h

Merge with 3.23.47

2001-12-15 05:12:21 +02:00

my_dbug.h

Change dbug.h -> my_dbug.h (Portability fix)

2003-03-17 19:06:14 +02:00

my_dir.h

Update copyright

2001-12-06 14:10:51 +02:00

my_getopt.h

New SET syntax & system variables.

2002-07-23 18:31:22 +03:00

my_global.h

my_global.h:

2003-06-06 10:50:13 +05:00

my_handler.h

Two-level index structure for FULLTEXT indexes

2003-01-21 19:24:34 +01:00

my_list.h

Portability fixes (for windows)

2003-01-21 21:07:59 +02:00

my_net.h

Fixes for Netware

2003-01-28 08:38:28 +02:00

my_no_pthread.h

merge with 3.23.52

2002-08-12 04:04:43 +03:00

my_nosys.h

Update copyright

2001-12-06 14:10:51 +02:00

my_pthread.h

Merge with 4.0.13

2003-05-19 16:35:49 +03:00

my_semaphore.h

more #ifdef THREAD added

2003-04-30 12:32:43 +02:00

my_sys.h

merge

2003-05-22 02:57:27 +03:00

my_tree.h

Merge with 4.0

2002-11-21 15:56:48 +02:00

my_xml.h

Portability fixes

2003-02-28 14:32:40 +02:00

myisam.h

Merge with 4.0.13

2003-03-26 18:37:38 +02:00

myisammrg.h

Merge with 4.0.8

2003-01-03 00:04:33 +02:00

myisampack.h

Merge with 4.0

2002-11-21 15:56:48 +02:00

mysql_com.h

SCRUM

2003-06-17 21:53:13 +05:00

mysql_embed.h

SCRUM

2003-06-17 21:32:31 +05:00

mysql_version.h.in

merge with public tree

2003-06-05 00:12:45 +03:00

mysql.h

SCRUM

2003-06-17 21:53:13 +05:00

mysqld_error.h

REVOKE all privileges and delete user(244)

2003-06-06 17:43:23 +05:00

mysys_err.h

Added useful exit error code for programs using my_getopt in case

2002-05-29 15:07:30 +03:00

nisam.h

Update copyright

2001-12-06 14:10:51 +02:00

queues.h

Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.

2002-11-07 03:54:00 +02:00

raid.h

Lots of code fixes to the replication code (especially the binary logging and index log file handling)

2002-08-08 03:12:02 +03:00

rijndael.h

Made keyread (key scanning) a key specific attribute.

2002-06-19 00:22:30 +03:00

sha1.h

Made keyread (key scanning) a key specific attribute.

2002-06-19 00:22:30 +03:00

sql_common.h

SCRUM

2003-06-17 21:53:13 +05:00

sql_state.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

sslopt-case.h

fixed so that --ssl and --skip-ssl works with the MySQL clients.

2002-09-17 23:46:53 +03:00

sslopt-longopts.h

consistency fix - all help texts for command-line options should end with a dot.

2003-06-13 10:59:02 +02:00

sslopt-vars.h

Update copyright

2001-12-06 14:10:51 +02:00

t_ctype.h

Update copyright

2001-12-06 14:10:51 +02:00

thr_alarm.h

Fix for mysql_list_fields & reset stmt buffers from stmt_free_result

2003-06-08 09:11:14 -07:00

thr_lock.h

Merge with 4.0

2003-03-16 19:17:54 +02:00

typelib.h

Windows build fix

2003-01-18 14:04:34 -08:00

violite.h

SCRUM

2003-06-17 21:32:31 +05:00