mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
9799 commits 2784 branches 343 tags 1.6 GiB
Commit graph

9799 commits

This branch
This branch
All branches
Author SHA1 Message Date
bell@laptop.sanja.is.com.ua
ddf4d1e529 fixed printability of Items (all items except subselects) 
(SCRUM) (WL#1274)
 2003-10-12 17:56:05 +03:00
guilhem@gbichot2
d6d6c5e1bb Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted. 
I manually edited rpl_openssl.result because the test is skipped on my
machine. Hope it's correct.
 2003-10-09 18:16:15 +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
heikki@hundin.mysql.fi
677a0dbebb os0file.h: 
Fix the Windows compilation error reported by Miguel 1.5 hours ago
 2003-10-09 08:54:15 +03: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
monty@narttu.mysql.fi
1febfbe86a deleted conflicting file 2003-10-08 22:41:45 +03: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
guilhem@mysql.com
324ff6dedf Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-10-08 20:53:07 +02: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
lenz@kallisto.local
ce9c9845a1 - portability fix: replaced "uint" with "unsigned int" 2003-10-08 13:26:29 +02:00
lenz@kallisto.local
2379030676 - added missing link line that seemed to have gone lost during the last 
4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)
 2003-10-08 13:06:47 +02:00
monty@narttu.mysql.fi
246febee42 merge with 4.0 to get fix for mysqlbinlog 2003-10-08 12:05:27 +03:00
monty@narttu.mysql.fi
d9ff665102 Fixes after merge 2003-10-08 12:01:58 +03:00
monty@narttu.mysql.fi
d00d9110ba Fixed test case that my last patch to mysqlbinlog broke. 
Changed --remote to --read-from-remote-server (mysqlbinlog)
 2003-10-08 10:23:54 +03:00
bell@laptop.sanja.is.com.ua
9b4018066e 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-08 08:50:57 +03:00
bar@bar.mysql.r18.ru
c5c4e31545 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-10-08 10:19:25 +05:00
bar@bar.mysql.r18.ru
9023009ae3 query_cache.result, query_cache.test: 
Character set variables test
 2003-10-08 10:18:38 +05:00
greg@mysql.com
7a6239640f Fixed test case to work on NetWare. 2003-10-08 00:19:44 -04:00
monty@narttu.mysql.fi
02ad66f32e Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-10-08 01:30:31 +03:00
monty@narttu.mysql.fi
a278a77475 Fix for option 'R' (connect to remote server) in mysqlbinlog 2003-10-08 01:30:10 +03:00
guilhem@gbichot2
528b082705 mysql_real_connect picks the Unix login when the user "" is used. 
This makes the test non-repeatable when running as root.
 So I change to not use the "" user, but a random string which will
 always result in the @localhost user being selected by the server.
 2003-10-07 23:15:13 +02:00
monty@narttu.mysql.fi
359d40f2f5 merge 2003-10-07 21:41:07 +03:00
guilhem@mysql.com
ed5d059202 Fix for a test failure with the standard (no-BDB) binary: 
as the test is meaningful only if the slave supports transactions,
we require this. As in 4.0 the slave runs with --skip-innodb, we
test for BDB.
 2003-10-07 20:41:06 +02:00
monty@narttu.mysql.fi
1f8e38d03a Merge with 4.0 to get fix for mysqlbinlog 2003-10-07 21:41:06 +03:00
monty@narttu.mysql.fi
1b06af3a97 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-10-07 21:41:05 +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
heikki@hundin.mysql.fi
6112853cda Many files: 
Multiple tablespaces for InnoDB
sql_table.cc:
  Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
 2003-10-07 17:28:59 +03:00
bell@laptop.sanja.is.com.ua
862ff0ed1c fixed error detection 2003-10-07 16:26:46 +03:00
bell@laptop.sanja.is.com.ua
efae22f617 merge 2003-10-07 16:22:48 +03:00
monty@narttu.mysql.fi
b82b76f480 Simple cleanups 2003-10-07 15:44:31 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
monty@narttu.mysql.fi
0091fa2e32 Fixed bug in sub select after last merge 2003-10-07 14:04:59 +03:00
bell@laptop.sanja.is.com.ua
09c139ac37 after merge fix 2003-10-07 13:31:44 +03:00
monty@narttu.mysql.fi
4b491cb788 Simple optimization 2003-10-07 13:26:56 +03:00
monty@narttu.mysql.fi
b31a79df3e merge 2003-10-07 11:24:38 +03:00
ram@gw.mysql.r18.ru
cb334d03f4 WL #562: Change format of slow log in 4.1 2003-10-07 12:05:35 +05:00
bell@laptop.sanja.is.com.ua
d5a7a6ec34 merge 2003-10-07 08:51:09 +03:00