Commits · 7436e9ec97feed09bbda0c3a8b58c6f1f30ca243 · nexedi / MariaDB

21 Jan, 2003 14 commits
- Merge · 7436e9ec
  monty@mashka.mysql.fi authored Jan 21, 2003
  
  7436e9ec
- Update to VC++ build files · 4fd9bad4
  monty@mashka.mysql.fi authored Jan 21, 2003
  
  4fd9bad4
- fulltext2.test: --enable/disable_warnings · 49580a51
  serg@serg.mysql.com authored Jan 21, 2003
  
  49580a51
- Portability fixes (for windows) · 25c393a1
  monty@mashka.mysql.fi authored Jan 21, 2003
```
Some changes to the prepared statement protocol to make it easier to use and faster.
```
  25c393a1
- merged · 3f55032c
  serg@serg.mysql.com authored Jan 21, 2003
  
  3f55032c
- Two-level index structure for FULLTEXT indexes · 0dff67cb
  serg@serg.mysql.com authored Jan 21, 2003
  
  0dff67cb
- Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 62c02d4b
  bell@sanja.is.com.ua authored Jan 21, 2003
```
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
```
  62c02d4b
- resolve fix · 70dfa422
  Sinisa@sinisa.nasamreza.org authored Jan 21, 2003
  
  70dfa422
- A small fix for privilege system as reported by HF. · 3e302c52
  Sinisa@sinisa.nasamreza.org authored Jan 21, 2003
  
  3e302c52
- Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 8aabee29
  bell@sanja.is.com.ua authored Jan 21, 2003
```
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
```
  8aabee29
- fixed test of cardinality · 372e2130
  bell@sanja.is.com.ua authored Jan 21, 2003
  
  372e2130
- fix removation · 4fa14086
  hf@deer.mysql.r18.ru authored Jan 21, 2003
  
  4fa14086
- Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 · 7d20900c
  hf@deer.mysql.r18.ru authored Jan 21, 2003
```
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
```
  7d20900c
- small fix · e757e47e
  hf@deer.mysql.r18.ru authored Jan 21, 2003
  
  e757e47e
20 Jan, 2003 7 commits
- Merge work.mysql.com:/home/bk/mysql-4.1 · fc945987
  venu@myvenu.com authored Jan 20, 2003
```
into myvenu.com:/home/venu/bk/src-4.1
```
  fc945987
- Multi query fix the recursion (SCRUM - For Monty) · 643264db
  venu@myvenu.com authored Jan 20, 2003
  
  643264db
- ha_innodb.cc: · a4a95cb2
  heikki@hundin.mysql.fi authored Jan 20, 2003
```
  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1
```
  a4a95cb2
- Merge with 4.0 (Fix bug in LEFT JOIN and EXPLAIN on empty table) · 6522ee6c
  monty@mashka.mysql.fi authored Jan 20, 2003
  
  6522ee6c
- Fixed bug with EXPLAIN on empty table · fab7f39e
  monty@mashka.mysql.fi authored Jan 20, 2003
  
  fab7f39e
- Conflicts resolving · 389680e0
  hf@deer.mysql.r18.ru authored Jan 20, 2003
  
  389680e0
- SCRUM · 1f6b6156
  hf@deer.mysql.r18.ru authored Jan 20, 2003
```
embedded-related changes
```
  1f6b6156
19 Jan, 2003 5 commits
- Fixed bug in LEFT JOIN with impossible ON/WHERE expression · a5e30be0
  monty@mashka.mysql.fi authored Jan 19, 2003
  
  a5e30be0
- Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · d14db396
  monty@mashka.mysql.fi authored Jan 19, 2003
  
  d14db396
- merge with 4.0 to get bug fix for SHOW PROCESSLIST + connected slave · 12ab0651
  monty@mashka.mysql.fi authored Jan 19, 2003
  
  12ab0651
- Removed compiler warnings · 0d284054
  monty@mashka.mysql.fi authored Jan 19, 2003
  
  0d284054
- Fixes cases where thd->query was not protected. · 183df2da
  monty@mashka.mysql.fi authored Jan 19, 2003
```
This fixes a problem with SHOW PROCESSLIST
```
  183df2da
18 Jan, 2003 14 commits
- Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread · fb4572a4
  monty@mashka.mysql.fi authored Jan 19, 2003
  
  fb4572a4
- Windows build fix · e0a79dc1
  venu@myvenu.com authored Jan 18, 2003
  
  e0a79dc1
- Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 · 1f8ad81e
  monty@mashka.mysql.fi authored Jan 18, 2003
  
  1f8ad81e
- Only set thd->query to 0 if LOCK_thread_count is hold · dd4d4cc8
  monty@mashka.mysql.fi authored Jan 18, 2003
```
This fixes a possible core dump problem in SHOW PROCESSLIST
```
  dd4d4cc8
- Merge myvenu.com:/home/venu/bk/src-4.1 · 9305ee0d
  venu@myvenu.com authored Jan 18, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  9305ee0d
- Few more tests + store_result fix · 04f20910
  venu@myvenu.com authored Jan 18, 2003
  
  04f20910
- Merge work.mysql.com:/home/bk/mysql-4.1 · 082f7c9b
  venu@myvenu.com authored Jan 18, 2003
```
into myvenu.com:/home/venu/bk/src-4.1
```
  082f7c9b
- Removed compiler warnings · 46ec0c5d
  monty@mashka.mysql.fi authored Jan 18, 2003
  
  46ec0c5d
- Initial multi query execution support · a39da98d
  venu@myvenu.com authored Jan 18, 2003
  
  a39da98d
- Simple code cleanups, ignore generated files · 88cd4126
  monty@mashka.mysql.fi authored Jan 18, 2003
  
  88cd4126
- Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · 529e4a76
  monty@mashka.mysql.fi authored Jan 18, 2003
  
  529e4a76
- Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 · e543f132
  vva@eagle.mysql.r18.ru authored Jan 18, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.control
```
  e543f132
- Merge eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.clear · 0bacaa10
  vva@eagle.mysql.r18.ru authored Jan 18, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.clone
```
  0bacaa10
- libedit need this file too... · 62e234fa
  vva@eagle.mysql.r18.ru authored Jan 18, 2003
  
  62e234fa