mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19291 commits 2791 branches 343 tags 1.7 GiB
Commit graph

19291 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
3ff1acb8db Bug#12363 
character_set_results is nullable, but value_ptr returns string "NULL"

set_var.cc:
  Create Item_null instead of Item_string for NULL values

variables.result, variables.test:
  adding test case
 2005-08-30 17:11:59 +05:00
jonas@eel.(none)
d61780999b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-30 08:59:17 +02:00
jonas@eel.(none)
91086d663c Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-30 08:57:30 +02:00
jonas@eel.(none)
4cc90aaab8 bug#12862 - ndb compile error 
fix typo
 2005-08-30 08:56:46 +02:00
pgalbraith@mysql.com
162353250e ha_blackhole.cc: 
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
 2005-08-30 02:46:03 +02:00
pgalbraith@mysql.com
9f45c8f2fe ha_blackhole.cc: 
Added missing DBUG enter, compiled and tested on production with debug-max
  build (my regular build missed the previous errors friday)

Changeset:
 Added missing DBUG_ENTER, compiled and tested on production with debug-max
 build!
 2005-08-29 21:22:06 +02:00
paul@frost.snake.net
6b265793c3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
 2005-08-29 11:25:12 -05:00
tomas@poseidon.ndb.mysql.com
dba2e0074b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-08-29 18:25:11 +02:00
tomas@poseidon.ndb.mysql.com
60df5fffb3 updated ndb redo file reader with schemaversion in commit rcord instead of prepare record 2005-08-29 18:23:53 +02:00
bar@mysql.com
96e0cb8cbf ctype_utf8.result, ctype_utf8.test, item.cc: 
Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
 2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12371
 2005-08-29 15:44:49 +05:00
kent@mysql.com
88af3ceb20 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-08-28 20:03:03 +02:00
kent@mysql.com
e2954b29a1 Makefile.am: 
Make ports configurable from environment for test
 2005-08-28 19:46:56 +02:00
paul@frost.snake.net
39e5dafb91 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
 2005-08-27 21:52:26 -05:00
paul@frost.snake.net
c0080aeba6 set_var.cc: 
Reorder out-of-order system variables.
 2005-08-27 19:20:10 -05:00
paul@frost.snake.net
458bc88563 mysqld.cc: 
Reorder out-of-order status variables.
 2005-08-27 19:18:53 -05:00
hf@deer.(none)
5b35789d12 Merge deer.(none):/home/hf/work/mysql-4.1.9645 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-08-27 18:06:09 +05:00
patg@radha.local
69114941cd typo to DBUG_RETURN fixed 2005-08-26 20:29:26 +02:00
patg@radha.local
6b4baf48a5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  radha.local:/Users/patg/mysql-build/mysql-4.1
 2005-08-26 03:14:56 +02:00
patg@radha.local
efff75ed1a ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, per brian 2005-08-26 02:09:56 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff5d26d777 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-08-25 23:24:16 +03:00
jonas@eel.(none)
c2b8f4ada3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-25 13:37:55 +02:00
jonas@eel.(none)
ded7670e5a Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-25 13:34:20 +02:00
jonas@eel.(none)
7fe87018b4 bug#12027 - ndb 
When detecting corrupt schema file.
  Make sure to close it (as it will be opened later when rewriting a clean copy)
 2005-08-25 13:16:29 +02:00
tomas@poseidon.ndb.mysql.com
f0b27795e4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-08-25 13:05:32 +02:00
tomas@poseidon.ndb.mysql.com
90778fc857 config: 
changed tomas default checkout
 2005-08-25 13:04:53 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-08-25 12:08:26 +03:00
monty@mishka.mysql.com
9605c5dba2 Add back changes lost in merge 
(Faster test)
 2005-08-25 10:19:06 +03:00
monty@mishka.local
0c5ca9be62 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-25 09:39:09 +03:00
monty@mishka.local
6773d24704 Remove function that was accidently added back 2005-08-25 09:03:41 +03:00
serg@sergbook.mysql.com
714b27c71c merged 2005-08-25 00:08:02 +04:00
serg@sergbook.mysql.com
909247a95f memroot: trash the memory in free_root() 2005-08-24 23:07:06 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
monty@mishka.local
17654cd7af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea Review fixes 2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b Merge mysql.com:/home/jimw/my/mysql-4.1-12302 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-24 08:50:12 -07:00
heikki@hundin.mysql.fi
10adc6b562 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-24 18:07:52 +03:00
heikki@hundin.mysql.fi
4bedb3091c subselect2.result: 
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
 2005-08-24 18:05:54 +03:00
joerg@mysql.com
8e756ecc4c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-08-24 16:30:26 +02:00
heikki@hundin.mysql.fi
2310ef6938 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-24 17:30:25 +03:00
heikki@hundin.mysql.fi
9f72d504b4 ha_innodb.cc: 
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
 2005-08-24 17:27:46 +03:00
joerg@mysql.com
bf000026b9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-08-24 16:13:48 +02:00
joerg@mysql.com
d8078165b0 Merge 2005-08-24 16:11:38 +02:00
kent@mysql.com
4d2cc6e503 Merge 2005-08-23 18:06:24 +02:00
serg@sergbook.mysql.com
1fbb96ea97 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-08-23 14:16:17 +04:00
tomas@poseidon.ndb.mysql.com
653e99dea2 removed ndb grep from configure .in 2005-08-23 12:16:16 +02:00
tomas@poseidon.ndb.mysql.com
28e3fe8759 enabled make of ndb_redo_log_reader 2005-08-23 11:50:24 +02:00
jimw@mysql.com
f70beef6c7 Use the hostname with which the user authenticated when determining which 
user to update with 'SET PASSWORD = ...'. (Bug #12302)
 2005-08-22 15:48:50 -07:00
hf@deer.(none)
bded7c984b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.9645
 2005-08-22 18:24:17 +05:00