vva@eagle.mysql.r18.ru
c74da8bbd7
added checking for empty index name (fixed bug #1419 )
2003-10-16 11:33:44 -04:00
monty@mashka.mysql.fi
72f0236336
Merge
2003-10-16 08:11:01 +03:00
monty@mashka.mysql.fi
f2884bac40
Changing max_insert_delayed_threads now also changes the size of thread alarm buffer.
2003-10-16 07:44:18 +03:00
monty@mashka.mysql.fi
e87c9f5ff8
merge with 4.0
2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
0d34e50f39
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-10-15 22:52:31 +03:00
monty@mashka.mysql.fi
9ef2a83fbe
Portability fixes for windows
...
After merge fixes
2003-10-15 22:40:36 +03:00
monty@mashka.mysql.fi
84d9d98078
Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
...
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
2003-10-15 21:41:13 +03:00
monty@mashka.mysql.fi
35c09b8082
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-15 16:23:01 +03:00
monty@mashka.mysql.fi
b5849f451d
Add more information about memory usage to debug log
2003-10-15 15:21:50 +03:00
gluh@gluh.mysql.r18.ru
9c2867c2d4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
2003-10-15 14:51:56 +05:00
gluh@gluh.mysql.r18.ru
9e401712a0
WL#1106: Switch = --maxdb rather than --sapdb
2003-10-15 14:50:36 +05:00
harrison@bud.lordblink.com
672a7791c4
Add in bit_xor function (approved by Sergei)
2003-10-15 02:11:03 -04:00
monty@mashka.mysql.fi
e71b53a8fe
merge with 4.0 to get fix for SET enum_system_variable=NULL
2003-10-14 16:34:09 +03:00
monty@mashka.mysql.fi
2d3840f550
Fixed bug in SET enum_system_variable=NULL
2003-10-14 16:30:42 +03:00
heikki@hundin.mysql.fi
d3827c1b22
row0purge.c, row0mysql.c, os0file.c, os0file.h, fil0fil.h, fil0fil.c:
...
IMPORT TABLESPACE must reset lsns if they are too high
ha_innodb.cc:
DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table
2003-10-14 14:53:16 +03:00
serg@serg.mylan
f078e50a6b
make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.
2003-10-14 13:10:41 +02:00
heikki@hundin.mysql.fi
f90253a7f8
sql_yacc.yy:
...
Add DISCARD etc. in the keyword: rule of sql_yacc.yy
sql_table.cc:
Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
2003-10-14 01:52:03 +03:00
serg@serg.mylan
f3e7012d6e
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-14 00:27:04 +02:00
monty@mashka.mysql.fi
461d1627b3
merge with 4.0 for more memory allocation variables.
2003-10-13 15:50:30 +03:00
bell@sanja.is.com.ua
1318470a96
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
2003-10-13 13:21:18 +03:00
heikki@hundin.mysql.fi
5ec87f2449
Many files:
...
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
2003-10-13 11:20:19 +03:00
bell@sanja.is.com.ua
628d2e4a7c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
2003-10-13 09:49:47 +03:00
serg@serg.mylan
32fed1e877
wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.
...
typo in error message text corrected.
new tests added
2003-10-12 15:16:45 +02:00
bell@laptop.sanja.is.com.ua
8f5c3f3981
fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clause
...
(BUG#1537)
2003-10-12 16:10:40 +03:00
monty@mashka.mysql.fi
c60a75e9ba
Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)
2003-10-11 23:26:39 +03:00
monty@mashka.mysql.fi
c95d142f8f
Add new user variables for tuning memory usage:
...
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
paul@ice.snake.net
54533936b1
mysqld.cc:
...
Fix error in --show-slave-auth-info help string.
2003-10-11 11:21:32 -05:00
guilhem@mysql.com
b2500829a3
Make the slave die if master is 5.0. Indeed, 5.0 masters send
...
a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.
2003-10-09 17:40:38 +02:00
guilhem@mysql.com
596e60b85c
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-09 14:56:51 +02:00
guilhem@gbichot2
f1df2a8cff
Tiny cleanup after the push of WL#1098 "Seconds_behind_master in SHOW SLAVE STATUS":
...
a better comment, and replacing an assignment by an equivalent simpler one.
2003-10-09 14:55:33 +02:00
paul@ice.snake.net
e32fb9191f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-10-08 18:39:40 -05:00
paul@ice.snake.net
5ac0812db2
errmsg.txt:
...
Add Stefan's new translations.
2003-10-08 18:08:51 -05:00
guilhem@mysql.com
44fc80c8a1
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-09 00:08:09 +02:00
guilhem@gbichot2
c0075fa64b
Final push for WL#1098:
...
"Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
Finally this is adding
- Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
- Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
on the master, computes the absolute difference between the master's and the slave's clock.
It records the timestamp of the last event executed by the SQL thread, and does a
small computation to find the number of seconds by which the slave is late.
2003-10-09 00:06:21 +02:00
paul@ice.snake.net
1979187c0d
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-10-08 14:41:46 -05:00
paul@ice.snake.net
9b9674275c
Merge
2003-10-08 14:29:25 -05:00
monty@narttu.mysql.fi
a533d88693
Portability fix
2003-10-08 22:05:06 +03:00
monty@narttu.mysql.fi
d37a5c4dd7
Indentation cleanups
...
Remove wait_if_global_read_lock on commit as this can cause deadlocks
2003-10-08 21:50:05 +03:00
paul@ice.snake.net
8e7aa7f875
Incorporate Stefan's new translations of German error messages.
2003-10-08 12:51:10 -05:00
monty@narttu.mysql.fi
dc6f07256c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-10-08 18:55:34 +03:00
monty@narttu.mysql.fi
9e57c12b5a
Fixed bug in error handling of CREATE ... SELECT
...
More tests cases
After merge fixes
2003-10-08 18:53:31 +03:00
monty@narttu.mysql.fi
d9ff665102
Fixes after merge
2003-10-08 12:01:58 +03:00
serg@serg.mylan
9d198d35bf
merged
2003-10-07 20:41:07 +02:00
monty@narttu.mysql.fi
359d40f2f5
merge
2003-10-07 21:41:07 +03:00
monty@narttu.mysql.fi
1f8e38d03a
Merge with 4.0 to get fix for mysqlbinlog
2003-10-07 21:41:06 +03:00
vva@eagle.mysql.r18.ru
16b8fd8ece
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
2003-10-07 14:41:04 -04:00
bell@laptop.sanja.is.com.ua
1324a97f63
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-07 21:01:57 +03:00
bell@laptop.sanja.is.com.ua
69c206915f
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
2003-10-07 19:20:51 +03:00
bell@laptop.sanja.is.com.ua
7921834334
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
2003-10-07 17:42:59 +03:00
bell@laptop.sanja.is.com.ua
e99441b045
after merge fix
2003-10-07 17:37:20 +03:00