unknown 34fff04d03 Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca ...

into  gbichot4.local:/home/mysql_src/mysql-maria-monty


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_global.h:
  merge
storage/myisam/myisamdef.h:
  merge

2008-02-18 23:35:17 +01:00

..

.cvsignore

Import changeset

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

acinclude.m4

Import changeset

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

client_settings.h

Fix compile warnings.

2007-09-29 23:31:08 +04:00

CMakeLists.txt

Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main

2007-12-16 17:03:44 +02:00

conf_to_src.c

manually merged

2004-08-18 19:57:55 +02:00

dll.c

Final patch to remove the last of the OS2 support.

2006-04-15 18:17:32 -07:00

errmsg.c

Added more descriptive error message of why statement was automaticly dropped

2007-04-13 01:56:22 +03:00

get_password.c

This is an implementation of two WL items:

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

libmysql.c

Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca

2008-02-18 23:35:17 +01:00

libmysql.def

Bug#29592 SQL Injection issue

2007-11-26 14:09:37 -02:00

libmysql.ver.in

BUG#3074: Unversioned symbols in shared library

2006-01-17 18:51:08 +04:00

Makefile.am

Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445

2007-11-22 14:39:07 +03:00

Makefile.shared

Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main

2007-12-16 17:03:44 +02:00

manager.c

Bug#12713 "Error in a stored function called from a SELECT doesn't

2007-12-12 18:21:01 +03:00