Commit graph

2988 commits

Author SHA1 Message Date
hf@deer.mysql.r18.ru
e757e47e7f small fix 2003-01-21 09:45:05 +04:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM
embedded-related changes
2003-01-20 18:47:25 +04:00
monty@mashka.mysql.fi
d14db3961d Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-01-19 02:28:36 +02:00
monty@mashka.mysql.fi
12ab0651c6 merge with 4.0 to get bug fix for SHOW PROCESSLIST + connected slave 2003-01-19 02:28:07 +02:00
monty@mashka.mysql.fi
183df2da7f Fixes cases where thd->query was not protected.
This fixes a problem with SHOW PROCESSLIST
2003-01-19 02:00:26 +02:00
monty@mashka.mysql.fi
fb4572a498 Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread 2003-01-19 01:31:43 +02:00
venu@myvenu.com
e0a79dc112 Windows build fix 2003-01-18 14:04:34 -08:00
monty@mashka.mysql.fi
dd4d4cc8b5 Only set thd->query to 0 if LOCK_thread_count is hold
This fixes a possible core dump problem in SHOW PROCESSLIST
2003-01-18 23:38:55 +02:00
venu@myvenu.com
9305ee0d54 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-01-18 12:59:33 -08:00
venu@myvenu.com
04f20910e3 Few more tests + store_result fix 2003-01-18 12:58:19 -08:00
venu@myvenu.com
082f7c9bda Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-18 11:59:36 -08:00
monty@mashka.mysql.fi
46ec0c5d33 Removed compiler warnings 2003-01-18 21:55:01 +02:00
venu@myvenu.com
a39da98d0d Initial multi query execution support 2003-01-18 11:53:38 -08:00
monty@mashka.mysql.fi
88cd4126e4 Simple code cleanups, ignore generated files 2003-01-18 19:31:38 +02:00
monty@mashka.mysql.fi
529e4a76c5 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-01-18 19:31:37 +02:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
2003-01-18 16:39:21 +02:00
hf@deer.mysql.r18.ru
c66302c23b Superfluous prepare_for_resend bugfix 2003-01-18 16:20:22 +04:00
monty@mashka.mysql.fi
76f146a175 Merge with 4.0.9 2003-01-18 03:13:37 +02:00
monty@hundin.mysql.fi
1b03f00710 merge 2003-01-17 21:41:38 +02:00
bell@sanja.is.com.ua
d4abbb0d9f Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-ctype-4.1
2003-01-17 20:49:47 +02:00
vva@eagle.mysql.r18.ru
23ed6656d3 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
2003-01-17 22:49:46 +04:00
vva@eagle.mysql.r18.ru
05aa563043 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
2003-01-17 22:04:43 +04:00
vva@eagle.mysql.r18.ru
1b25ee3579 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
2003-01-17 21:59:03 +04:00
vva@eagle.mysql.r18.ru
4b5a313c1a new option --local-load in mysqlbinlog 2003-01-17 21:52:56 +04:00
monty@mashka.mysql.fi
4a5ecc92be merge 2003-01-17 16:45:17 +02:00
monty@mashka.mysql.fi
762cb225c9 Changed my_strntoxxx functions to clear error number on start
Allow one to change ANSI_QUOTES mode per thread and on the fly
2003-01-17 16:33:54 +02:00
monty@mashka.mysql.fi
9fb477569b Fixed bug with the --slow-log when logging an administrator command
(like FLUSH TABLES).
(Code is already in 4.0)
2003-01-17 15:56:16 +02:00
bell@sanja.is.com.ua
6424fdf1dd Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-ctype-4.1
2003-01-17 15:43:39 +02:00
bell@sanja.is.com.ua
1dde85db7c using internal name conversion in query cache as it was suggested by Shurik 2003-01-17 15:36:08 +02:00
gluh@gluh.mysql.r18.ru
f2a193521e Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd
2003-01-17 16:40:54 +04:00
gluh@gluh.mysql.r18.ru
6ac602142a Replication: Optimize away string.append
Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
Fixed rpl_temporary test
2003-01-17 16:39:29 +04:00
monty@mashka.mysql.fi
9fb3f5aa1a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-17 14:23:48 +02:00
serg@serg.mysql.com
19e81a98e2 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-17 12:48:47 +01:00
serg@serg.mysql.com
390982aaa3 bugfix for MERGE tables and MAX(key) 2003-01-17 12:48:23 +01:00
miguel@hegel.local
08aaa21b6e Merge miguel@work.mysql.com:/home/bk/mysql-4.0
into hegel.local:/home/miguel/dev/mysql-4.0
2003-01-16 22:31:54 -04:00
miguel@hegel.local
e2548b3fa5 Fix VC++ error compiler 2003-01-16 22:29:24 -04:00
venu@myvenu.com
51eb44c9e6 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-16 15:47:46 -08:00
venu@myvenu.com
c2ddffb4a2 Remove un-used code 2003-01-16 14:57:49 -08:00
heikki@hundin.mysql.fi
9a2afb60c7 ha_innodb.cc:
Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST
2003-01-17 00:50:27 +02:00
monty@mashka.mysql.fi
f4b950df96 Merge with 3.23 2003-01-16 20:47:46 +02:00
monty@mashka.mysql.fi
6250c1d974 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-16 20:12:00 +02:00
bar@bar.mysql.r18.ru
4f9d82700d strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
serg@serg.mysql.com
c16e908a2b bugfix for 'ANALYZE for MERGE' and table-less MERGE table 2003-01-16 13:23:33 +01:00
bar@bar.mysql.r18.ru
4a77f335f4 field.cc:
strnxfrm for binary and simple charsets
2003-01-16 15:52:37 +04:00
bar@bar.mysql.r18.ru
4b9d29c83b strnxfrm() for simple and binary charsets fixes 2003-01-16 15:20:38 +04:00
heikki@hundin.mysql.fi
01573f0d95 ha_innodb.cc:
Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle
2003-01-16 08:06:43 +02:00
heikki@hundin.mysql.fi
0efc57eed6 ha_innodb.cc:
Make SHOW INNODB STATUS aware when we are estimating index range size etc.
2003-01-16 07:15:55 +02:00
jani@rhols221.adsl.netsonic.fi
e79ed81d11 Added --compatible mode to mysqldump. 2003-01-16 05:35:59 +02:00
jani@rhols221.adsl.netsonic.fi
94cc7d751e Added support sql_mode, which can be used to produce various outputs
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.
2003-01-16 02:04:50 +02:00