mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown 2aed7cf90e post-merge fixes to make it compile. It still fails the fulltext test, 
(wrong error code) but I'll push it so that Sergei could clean up
 my merge


include/mysqld_error.h:
  fixed typo
mysql-test/r/order_by.result:
  updated result for merged test
sql/Makefile.am:
  put back sql_union.cc lost during merge
sql/mysql_priv.h:
  restored variables lost in the merge
sql/mysqld.cc:
  put back lost variable declarations
sql/share/czech/errmsg.txt:
  merge fix
sql/share/danish/errmsg.txt:
  merge fix
sql/share/dutch/errmsg.txt:
  merge fix
sql/share/english/errmsg.txt:
  merge fix
sql/share/estonian/errmsg.txt:
  merge fix
sql/share/french/errmsg.txt:
  merge fix
sql/share/german/errmsg.txt:
  merge fix
sql/share/greek/errmsg.txt:
  merge fix
sql/share/hungarian/errmsg.txt:
  merge fix
sql/share/italian/errmsg.txt:
  merge fix
sql/share/japanese/errmsg.txt:
  merge fix
sql/share/korean/errmsg.txt:
  merge fix
sql/share/norwegian-ny/errmsg.txt:
  merge fix
sql/share/norwegian/errmsg.txt:
  merge fix
sql/share/polish/errmsg.txt:
  merge fix
sql/share/portuguese/errmsg.txt:
  merge fix
sql/share/romanian/errmsg.txt:
  merge fix
sql/share/russian/errmsg.txt:
  merge fix
sql/share/slovak/errmsg.txt:
  merge fix
sql/share/spanish/errmsg.txt:
  merge fix
sql/share/swedish/errmsg.txt:
  merge fix
sql/sql_acl.cc:
  merge fix
2001-08-11 19:54:31 -06:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
.my_sys.h.swp fixed --skip-slave-thread bug 2000-10-26 22:11:55 -06:00
config-win.h Fixed benchmarks and compare of NULL with <> 2000-10-17 23:57:26 +03:00
dbug.h Small bug fixes 2000-09-07 04:55:17 +03:00
errmsg.h auto-magic replication redirection logic support in the client, 2001-06-08 19:24:41 -06:00
ft_global.h ft_* variables added 2001-04-17 21:30:02 +02:00
getopt.h New thr_alarm struct for better integration with OS2 2000-11-28 04:47:47 +02:00
global.h OpenSSL fixes. Should not affect anything else. 2001-07-24 14:07:46 +08:00
hash.h Import changeset 2000-07-31 21:29:14 +02:00
heap.h Fixed --no-defaults in mysqltest 2000-12-29 16:06:10 +02:00
m_ctype.h Portability fixes 2001-04-23 03:28:08 +03:00
m_string.h Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3 2001-06-03 16:45:49 +03:00
Makefile.am Added missing file 2001-02-03 18:18:58 +02:00
merge.h Import changeset 2000-07-31 21:29:14 +02:00
my_alarm.h Import changeset 2000-07-31 21:29:14 +02:00
my_base.h merged 2001-07-02 21:52:22 +02:00
my_bitmap.h Force sockets to be blocking on HPUX 11.0 2001-02-07 23:27:19 +02:00
my_dir.h Import changeset 2000-07-31 21:29:14 +02:00
my_list.h Import changeset 2000-07-31 21:29:14 +02:00
my_net.h Portability fixes 2001-02-02 03:47:06 +02:00
my_no_pthread.h Import changeset 2000-07-31 21:29:14 +02:00
my_nosys.h Import changeset 2000-07-31 21:29:14 +02:00
my_pthread.h Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
my_sys.h LOAD DATA INFILE is now replicated properly, except for cleanup on 2001-08-03 15:57:53 -06:00
my_tree.h memory-limited tree 2001-07-02 21:18:57 +02:00
myisam.h merged 2001-07-02 21:52:22 +02:00
myisammrg.h Fix for SAFE_MUTEX + MERGE tables 2000-09-21 01:58:38 +03:00
myisampack.h Check that __FLOAT_WORD_ORDER is defined 2001-02-08 04:43:55 +02:00
mysql.h Embedded mysql fixes. 2001-08-10 12:37:36 -04:00
mysql_com.h merged 2001-08-11 17:28:41 -06:00
mysql_version.h.in Changes for --with-server-suffix 2001-01-21 16:30:16 +02:00
mysqld_error.h post-merge fixes to make it compile. It still fails the fulltext test, 2001-08-11 19:54:31 -06:00
mysys_err.h Added functions for symbolic link handling to make it possible to 2001-05-31 12:18:53 +03:00
nisam.h Import changeset 2000-07-31 21:29:14 +02:00
queues.h Fixes for MERGE TABLES and HEAP tables 2000-09-14 02:39:07 +03:00
raid.h Use C-style comments in common header files and C code. 2001-01-16 22:35:27 +02:00
sslopt-case.h Use C-style comments in common header files and C code. 2001-01-16 22:35:27 +02:00
sslopt-longopts.h Import changeset 2000-07-31 21:29:14 +02:00
sslopt-usage.h Import changeset 2000-07-31 21:29:14 +02:00
sslopt-vars.h Import changeset 2000-07-31 21:29:14 +02:00
t_ctype.h Import changeset 2000-07-31 21:29:14 +02:00
thr_alarm.h New thr_alarm struct for better integration with OS2 2000-11-28 04:47:47 +02:00
thr_lock.h Upgrade TL_WRITE_CONCURRENT_INSERT to TL_WRITE_LOW_PRIORITY if 2001-07-18 23:34:04 +03:00
violite.h OpenSSL fixes. Should not affect anything else. 2001-07-24 14:07:46 +08:00